diff --git a/cache/src/main/java/net/runelite/cache/script/Instructions.java b/cache/src/main/java/net/runelite/cache/script/Instructions.java index 17dfabfcd1..a0c7b859a1 100644 --- a/cache/src/main/java/net/runelite/cache/script/Instructions.java +++ b/cache/src/main/java/net/runelite/cache/script/Instructions.java @@ -78,6 +78,7 @@ public class Instructions add(CC_SETSIZE, "cc_setsize"); add(CC_SETHIDE, "cc_sethide"); add(CC_SETNOCLICKTHROUGH, "cc_setnoclickthrough"); + add(CC_SETNOSCROLLTHROUGH, "cc_setnoscrollthrough"); add(CC_SETSCROLLPOS, "cc_setscrollpos"); add(CC_SETCOLOUR, "cc_setcolour"); add(CC_SETFILL, "cc_setfill"); @@ -287,11 +288,14 @@ public class Instructions add(SETSHOWLOADINGMESSAGES, "setshowloadingmessages"); add(SETTAPTODROP, "settaptodrop"); add(GETTAPTODROP, "gettaptodrop"); + add(SETOCULUSORBSPEED, "setoculusorbspeed"); add(GETCANVASSIZE, "getcanvassize"); add(SETHIDEUSERNAME, "sethideusername"); add(GETHIDEUSERNAME, "gethideusername"); add(SETREMEMBERUSERNAME, "setrememberusername"); add(GETREMEMBERUSERNAME, "getrememberusername"); + add(SETTITLEMUSICENABLED, "settitlemusicenabled"); + add(GETTITLEMUSICENABLED, "gettitlemusicenabled"); add(SOUND_SYNTH, "sound_synth"); add(SOUND_SONG, "sound_song"); add(SOUND_JINGLE, "sound_jingle"); @@ -411,6 +415,7 @@ public class Instructions add(REMOVETAGS, "removetags"); add(STRING_INDEXOF_CHAR, "string_indexof_char"); add(STRING_INDEXOF_STRING, "string_indexof_string"); + add(UPPERCASE, "uppercase"); add(OC_NAME, "oc_name"); add(OC_OP, "oc_op"); add(OC_IOP, "oc_iop"); @@ -461,6 +466,7 @@ public class Instructions add(WORLDLIST_NEXT, "worldlist_next"); add(WORLDLIST_SPECIFIC, "worldlist_specific"); add(WORLDLIST_SORT, "worldlist_sort"); + add(GETWORLDINFO, "getworldinfo"); add(SETFOLLOWEROPSLOWPRIORITY, "setfolloweropslowpriority"); add(NC_PARAM, "nc_param"); add(LC_PARAM, "lc_param"); diff --git a/cache/src/main/java/net/runelite/cache/script/Opcodes.java b/cache/src/main/java/net/runelite/cache/script/Opcodes.java index e69a1ef5ef..5a4fe89061 100644 --- a/cache/src/main/java/net/runelite/cache/script/Opcodes.java +++ b/cache/src/main/java/net/runelite/cache/script/Opcodes.java @@ -69,6 +69,7 @@ public class Opcodes public static final int CC_SETSIZE = 1001; public static final int CC_SETHIDE = 1003; public static final int CC_SETNOCLICKTHROUGH = 1005; + public static final int CC_SETNOSCROLLTHROUGH = 1006; public static final int CC_SETSCROLLPOS = 1100; public static final int CC_SETCOLOUR = 1101; public static final int CC_SETFILL = 1102; @@ -278,11 +279,14 @@ public class Opcodes public static final int SETSHOWLOADINGMESSAGES = 3126; public static final int SETTAPTODROP = 3127; public static final int GETTAPTODROP = 3128; + public static final int SETOCULUSORBSPEED = 3129; public static final int GETCANVASSIZE = 3132; public static final int SETHIDEUSERNAME = 3141; public static final int GETHIDEUSERNAME = 3142; public static final int SETREMEMBERUSERNAME = 3143; public static final int GETREMEMBERUSERNAME = 3144; + public static final int SETTITLEMUSICENABLED = 3146; + public static final int GETTITLEMUSICENABLED = 3147; public static final int SOUND_SYNTH = 3200; public static final int SOUND_SONG = 3201; public static final int SOUND_JINGLE = 3202; @@ -402,6 +406,7 @@ public class Opcodes public static final int REMOVETAGS = 4119; public static final int STRING_INDEXOF_CHAR = 4120; public static final int STRING_INDEXOF_STRING = 4121; + public static final int UPPERCASE = 4122; public static final int OC_NAME = 4200; public static final int OC_OP = 4201; public static final int OC_IOP = 4202; @@ -452,6 +457,7 @@ public class Opcodes public static final int WORLDLIST_NEXT = 6502; public static final int WORLDLIST_SPECIFIC = 6506; public static final int WORLDLIST_SORT = 6507; + public static final int GETWORLDINFO = 6511; public static final int SETFOLLOWEROPSLOWPRIORITY = 6512; public static final int NC_PARAM = 6513; public static final int LC_PARAM = 6514; diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/ScriptOpcodesTransformer.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/ScriptOpcodesTransformer.java new file mode 100644 index 0000000000..3c6bb67a7c --- /dev/null +++ b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/ScriptOpcodesTransformer.java @@ -0,0 +1,152 @@ +package net.runelite.deob.deobfuscators.transformers; + +import java.util.ListIterator; +import net.runelite.asm.ClassFile; +import net.runelite.asm.ClassGroup; +import net.runelite.asm.Field; +import net.runelite.asm.Method; +import net.runelite.asm.Type; +import net.runelite.asm.attributes.Code; +import net.runelite.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; +import net.runelite.asm.attributes.code.instructions.GetStatic; +import net.runelite.asm.attributes.code.instructions.ILoad; +import net.runelite.asm.attributes.code.instructions.IfICmpEq; +import net.runelite.asm.attributes.code.instructions.IfICmpNe; +import net.runelite.asm.attributes.code.instructions.LDC; +import net.runelite.asm.attributes.code.instructions.PutStatic; +import net.runelite.asm.attributes.code.instructions.VReturn; +import net.runelite.asm.pool.Class; +import net.runelite.asm.signature.Signature; +import net.runelite.deob.Transformer; +import net.runelite.deob.deobfuscators.transformers.scriptopcodes.ScriptOpcode; +import org.objectweb.asm.Opcodes; +import static org.objectweb.asm.Opcodes.ACC_FINAL; +import static org.objectweb.asm.Opcodes.ACC_PUBLIC; +import static org.objectweb.asm.Opcodes.ACC_STATIC; + +public class ScriptOpcodesTransformer implements Transformer // robots in disguise +{ + private static final String SCRIPT_OPCODES = "net/runelite/rs/ScriptOpcodes"; + + @Override + public void transform(ClassGroup group) + { + initializeOpcodesClassFile(group); + + for (ClassFile cf : group.getClasses()) + { + if (cf.getName().startsWith("net/runelite/rs")) + { + continue; + } + + for (Method m : cf.getMethods()) + { + if (!m.isStatic()) + { + continue; + } + + if (!m.getDescriptor().getArguments().contains(new Type("LScript;")) && !m.getDescriptor().getArguments().contains(new Type("LScriptEvent;"))) + { + continue; + } + + boolean varIndexIsKnownAnd0 = m.getDescriptor().getArguments().contains(new Type("LScript;")); + + Code code = m.getCode(); + Instructions ins = code.getInstructions(); + ListIterator it = ins.getInstructions().listIterator(); + + Instruction i; + while (it.hasNext()) + { + i = it.next(); + + if (!(i instanceof ILoad) || (varIndexIsKnownAnd0 && ((ILoad) i).getVariableIndex() != 0)) + { + continue; + } + + i = it.next(); + + if (!(i instanceof PushConstantInstruction) || + !(((PushConstantInstruction) i).getConstant() instanceof Number)) + { + continue; + } + + int val = ((Number) ((PushConstantInstruction) i).getConstant()).intValue(); + String name = ScriptOpcode.nameFromID(val); + + i = it.next(); + + if (name == null || !(i instanceof IfICmpNe || i instanceof IfICmpEq)) + { + continue; + } + + it.previous(); + it.previous(); + + net.runelite.asm.pool.Field pool = new net.runelite.asm.pool.Field( + new Class(SCRIPT_OPCODES), + name, + Type.INT + ); + + GetStatic getStatic = new GetStatic(ins, pool); + it.set(getStatic); + } + } + } + } + + private static void initializeOpcodesClassFile(ClassGroup group) + { + ClassFile scriptOpcodes = group.findClass(SCRIPT_OPCODES); + if (scriptOpcodes == null) + { + scriptOpcodes = new ClassFile(group); + scriptOpcodes.setName(SCRIPT_OPCODES); + scriptOpcodes.setSuperName(Type.OBJECT.getInternalName()); + scriptOpcodes.setAccess(Opcodes.ACC_PUBLIC); + group.addClass(scriptOpcodes); + } + else + { + scriptOpcodes.getFields().clear(); + } + + Method clinit = scriptOpcodes.findMethod(""); + if (clinit == null) + { + clinit = new Method(scriptOpcodes, "", new Signature("()V")); + clinit.setStatic(true); + Code code = new Code(clinit); + code.setMaxStack(1); + clinit.setCode(code); + scriptOpcodes.addMethod(clinit); + } + + Code code = clinit.getCode(); + Instructions ins = code.getInstructions(); + + for (ScriptOpcode opcode : ScriptOpcode.values()) + { + Field field = new Field(scriptOpcodes, opcode.name(), Type.INT); + field.setAccessFlags(ACC_PUBLIC | ACC_STATIC | ACC_FINAL); + field.setValue(opcode.opcode); + scriptOpcodes.addField(field); + + LDC ldc = new LDC(ins, opcode.opcode); + PutStatic put = new PutStatic(ins, field); + ins.addInstruction(0, ldc); + ins.addInstruction(1, put); + } + + ins.addInstruction(new VReturn(ins)); + } +} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/scriptopcodes/ScriptOpcode.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/scriptopcodes/ScriptOpcode.java new file mode 100644 index 0000000000..1a8e4abbfd --- /dev/null +++ b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/scriptopcodes/ScriptOpcode.java @@ -0,0 +1,517 @@ +package net.runelite.deob.deobfuscators.transformers.scriptopcodes; + +import com.google.common.collect.ImmutableMap; +import java.util.Map; + +public enum ScriptOpcode +{ + // This class is pretty much the same as net.runelite.cache.script.Opcodes, and should be updated alongside that + + ICONST(0), + GET_VARP(1), + SET_VARP(2), + SCONST(3), + JUMP(6), + IF_ICMPNE(7), + IF_ICMPEQ(8), + IF_ICMPLT(9), + IF_ICMPGT(10), + RETURN(21), + GET_VARBIT(25), + SET_VARBIT(27), + IF_ICMPLE(31), + IF_ICMPGE(32), + ILOAD(33), + ISTORE(34), + SLOAD(35), + SSTORE(36), + JOIN_STRING(37), + POP_INT(38), + POP_STRING(39), + INVOKE(40), + GET_VARC_INT(42), + SET_VARC_INT(43), + DEFINE_ARRAY(44), + GET_ARRAY_INT(45), + SET_ARRAY_INT(46), + GET_VARC_STRING_OLD(47), + SET_VARC_STRING_OLD(48), + GET_VARC_STRING(49), + SET_VARC_STRING(50), + SWITCH(60), + CC_CREATE(100), + CC_DELETE(101), + CC_DELETEALL(102), + CC_FIND(200), + IF_FIND(201), + CC_SETPOSITION(1000), + CC_SETSIZE(1001), + CC_SETHIDE(1003), + CC_SETNOCLICKTHROUGH(1005), + CC_SETNOSCROLLTHROUGH(1006), + CC_SETSCROLLPOS(1100), + CC_SETCOLOUR(1101), + CC_SETFILL(1102), + CC_SETTRANS(1103), + CC_SETLINEWID(1104), + CC_SETGRAPHIC(1105), + CC_SET2DANGLE(1106), + CC_SETTILING(1107), + CC_SETMODEL(1108), + CC_SETMODELANGLE(1109), + CC_SETMODELANIM(1110), + CC_SETMODELORTHOG(1111), + CC_SETTEXT(1112), + CC_SETTEXTFONT(1113), + CC_SETTEXTALIGN(1114), + CC_SETTEXTSHADOW(1115), + CC_SETOUTLINE(1116), + CC_SETGRAPHICSHADOW(1117), + CC_SETVFLIP(1118), + CC_SETHFLIP(1119), + CC_SETSCROLLSIZE(1120), + CC_RESUME_PAUSEBUTTON(1121), + CC_SETFILLCOLOUR(1123), + CC_SETLINEDIRECTION(1126), + CC_SETOBJECT(1200), + CC_SETNPCHEAD(1201), + CC_SETPLAYERHEAD_SELF(1202), + CC_SETOBJECT_NONUM(1205), + CC_SETOBJECT_ALWAYS_NUM(1212), + CC_SETOP(1300), + CC_SETDRAGGABLE(1301), + CC_SETDRAGGABLEBEHAVIOR(1302), + CC_SETDRAGDEADZONE(1303), + CC_SETDRAGDEADTIME(1304), + CC_SETOPBASE(1305), + CC_SETTARGETVERB(1306), + CC_CLEAROPS(1307), + CC_SETONCLICK(1400), + CC_SETONHOLD(1401), + CC_SETONRELEASE(1402), + CC_SETONMOUSEOVER(1403), + CC_SETONMOUSELEAVE(1404), + CC_SETONDRAG(1405), + CC_SETONTARGETLEAVE(1406), + CC_SETONVARTRANSMIT(1407), + CC_SETONTIMER(1408), + CC_SETONOP(1409), + CC_SETONDRAGCOMPLETE(1410), + CC_SETONCLICKREPEAT(1411), + CC_SETONMOUSEREPEAT(1412), + CC_SETONINVTRANSMIT(1414), + CC_SETONSTATTRANSMIT(1415), + CC_SETONTARGETENTER(1416), + CC_SETONSCROLLWHEEL(1417), + CC_SETONCHATTRANSMIT(1418), + CC_SETONKEY(1419), + CC_SETONFRIENDTRANSMIT(1420), + CC_SETONCLANTRANSMIT(1421), + CC_SETONMISCTRANSMIT(1422), + CC_SETONDIALOGABORT(1423), + CC_SETONSUBCHANGE(1424), + CC_SETONSTOCKTRANSMIT(1425), + CC_SETONRESIZE(1427), + CC_GETX(1500), + CC_GETY(1501), + CC_GETWIDTH(1502), + CC_GETHEIGHT(1503), + CC_GETHIDE(1504), + CC_GETLAYER(1505), + CC_GETSCROLLX(1600), + CC_GETSCROLLY(1601), + CC_GETTEXT(1602), + CC_GETSCROLLWIDTH(1603), + CC_GETSCROLLHEIGHT(1604), + CC_GETMODELZOOM(1605), + CC_GETMODELANGLE_X(1606), + CC_GETMODELANGLE_Z(1607), + CC_GETMODELANGLE_Y(1608), + CC_GETTRANS(1609), + CC_GETCOLOUR(1611), + CC_GETFILLCOLOUR(1612), + CC_GETINVOBJECT(1700), + CC_GETINVCOUNT(1701), + CC_GETID(1702), + CC_GETTARGETMASK(1800), + CC_GETOP(1801), + CC_GETOPBASE(1802), + CC_CALLONRESIZE(1927), + IF_SETPOSITION(2000), + IF_SETSIZE(2001), + IF_SETHIDE(2003), + IF_SETNOCLICKTHROUGH(2005), + IF_SETSCROLLPOS(2100), + IF_SETCOLOUR(2101), + IF_SETFILL(2102), + IF_SETTRANS(2103), + IF_SETLINEWID(2104), + IF_SETGRAPHIC(2105), + IF_SET2DANGLE(2106), + IF_SETTILING(2107), + IF_SETMODEL(2108), + IF_SETMODELANGLE(2109), + IF_SETMODELANIM(2110), + IF_SETMODELORTHOG(2111), + IF_SETTEXT(2112), + IF_SETTEXTFONT(2113), + IF_SETTEXTALIGN(2114), + IF_SETTEXTSHADOW(2115), + IF_SETOUTLINE(2116), + IF_SETGRAPHICSHADOW(2117), + IF_SETVFLIP(2118), + IF_SETHFLIP(2119), + IF_SETSCROLLSIZE(2120), + IF_RESUME_PAUSEBUTTON(2121), + IF_SETFILLCOLOUR(2123), + IF_SETLINEDIRECTION(2126), + IF_SETOBJECT(2200), + IF_SETNPCHEAD(2201), + IF_SETPLAYERHEAD_SELF(2202), + IF_SETOBJECT_NONUM(2205), + IF_SETOBJECT_ALWAYS_NUM(2212), + IF_SETOP(2300), + IF_SETDRAGGABLE(2301), + IF_SETDRAGGABLEBEHAVIOR(2302), + IF_SETDRAGDEADZONE(2303), + IF_SETDRAGDEADTIME(2304), + IF_SETOPBASE(2305), + IF_SETTARGETVERB(2306), + IF_CLEAROPS(2307), + IF_SETOPKEY(2350), + IF_SETOPTKEY(2351), + IF_SETOPKEYRATE(2352), + IF_SETOPTKEYRATE(2353), + IF_SETOPKEYIGNOREHELD(2354), + IF_SETOPTKEYIGNOREHELD(2355), + IF_SETONCLICK(2400), + IF_SETONHOLD(2401), + IF_SETONRELEASE(2402), + IF_SETONMOUSEOVER(2403), + IF_SETONMOUSELEAVE(2404), + IF_SETONDRAG(2405), + IF_SETONTARGETLEAVE(2406), + IF_SETONVARTRANSMIT(2407), + IF_SETONTIMER(2408), + IF_SETONOP(2409), + IF_SETONDRAGCOMPLETE(2410), + IF_SETONCLICKREPEAT(2411), + IF_SETONMOUSEREPEAT(2412), + IF_SETONINVTRANSMIT(2414), + IF_SETONSTATTRANSMIT(2415), + IF_SETONTARGETENTER(2416), + IF_SETONSCROLLWHEEL(2417), + IF_SETONCHATTRANSMIT(2418), + IF_SETONKEY(2419), + IF_SETONFRIENDTRANSMIT(2420), + IF_SETONCLANTRANSMIT(2421), + IF_SETONMISCTRANSMIT(2422), + IF_SETONDIALOGABORT(2423), + IF_SETONSUBCHANGE(2424), + IF_SETONSTOCKTRANSMIT(2425), + IF_SETONRESIZE(2427), + IF_GETX(2500), + IF_GETY(2501), + IF_GETWIDTH(2502), + IF_GETHEIGHT(2503), + IF_GETHIDE(2504), + IF_GETLAYER(2505), + IF_GETSCROLLX(2600), + IF_GETSCROLLY(2601), + IF_GETTEXT(2602), + IF_GETSCROLLWIDTH(2603), + IF_GETSCROLLHEIGHT(2604), + IF_GETMODELZOOM(2605), + IF_GETMODELANGLE_X(2606), + IF_GETMODELANGLE_Z(2607), + IF_GETMODELANGLE_Y(2608), + IF_GETTRANS(2609), + IF_GETCOLOUR(2611), + IF_GETFILLCOLOUR(2612), + IF_GETINVOBJECT(2700), + IF_GETINVCOUNT(2701), + IF_HASSUB(2702), + IF_GETTOP(2706), + IF_GETTARGETMASK(2800), + IF_GETOP(2801), + IF_GETOPBASE(2802), + IF_CALLONRESIZE(2927), + MES(3100), + ANIM(3101), + IF_CLOSE(3103), + RESUME_COUNTDIALOG(3104), + RESUME_NAMEDIALOG(3105), + RESUME_STRINGDIALOG(3106), + OPPLAYER(3107), + IF_DRAGPICKUP(3108), + CC_DRAGPICKUP(3109), + MOUSECAM(3110), + GETREMOVEROOFS(3111), + SETREMOVEROOFS(3112), + OPENURL(3113), + RESUME_OBJDIALOG(3115), + BUG_REPORT(3116), + SETSHIFTCLICKDROP(3117), + SETSHOWMOUSEOVERTEXT(3118), + RENDERSELF(3119), + SETSHOWMOUSECROSS(3125), + SETSHOWLOADINGMESSAGES(3126), + SETTAPTODROP(3127), + GETTAPTODROP(3128), + SETOCULUSORBSPEED(3129), + GETCANVASSIZE(3132), + SETHIDEUSERNAME(3141), + GETHIDEUSERNAME(3142), + SETREMEMBERUSERNAME(3143), + GETREMEMBERUSERNAME(3144), + SETTITLEMUSICENABLED(3146), + GETTITLEMUSICENABLED(3147), + SOUND_SYNTH(3200), + SOUND_SONG(3201), + SOUND_JINGLE(3202), + CLIENTCLOCK(3300), + INV_GETOBJ(3301), + INV_GETNUM(3302), + INV_TOTAL(3303), + INV_SIZE(3304), + STAT(3305), + STAT_BASE(3306), + STAT_XP(3307), + COORD(3308), + COORDX(3309), + COORDZ(3310), + COORDY(3311), + MAP_MEMBERS(3312), + INVOTHER_GETOBJ(3313), + INVOTHER_GETNUM(3314), + INVOTHER_TOTAL(3315), + STAFFMODLEVEL(3316), + REBOOTTIMER(3317), + MAP_WORLD(3318), + RUNENERGY_VISIBLE(3321), + RUNWEIGHT_VISIBLE(3322), + PLAYERMOD(3323), + WORLDFLAGS(3324), + MOVECOORD(3325), + ENUM_STRING(3400), + ENUM(3408), + ENUM_GETOUTPUTCOUNT(3411), + FRIEND_COUNT(3600), + FRIEND_GETNAME(3601), + FRIEND_GETWORLD(3602), + FRIEND_GETRANK(3603), + FRIEND_SETRANK(3604), + FRIEND_ADD(3605), + FRIEND_DEL(3606), + IGNORE_ADD(3607), + IGNORE_DEL(3608), + FRIEND_TEST(3609), + CLAN_GETCHATDISPLAYNAME(3611), + CLAN_GETCHATCOUNT(3612), + CLAN_GETCHATUSERNAME(3613), + CLAN_GETCHATUSERWORLD(3614), + CLAN_GETCHATUSERRANK(3615), + CLAN_GETCHATMINKICK(3616), + CLAN_KICKUSER(3617), + CLAN_GETCHATRANK(3618), + CLAN_JOINCHAT(3619), + CLAN_LEAVECHAT(3620), + IGNORE_COUNT(3621), + IGNORE_GETNAME(3622), + IGNORE_TEST(3623), + CLAN_ISSELF(3624), + CLAN_GETCHATOWNERNAME(3625), + CLAN_ISFRIEND(3626), + CLAN_ISIGNORE(3627), + STOCKMARKET_GETOFFERTYPE(3903), + STOCKMARKET_GETOFFERITEM(3904), + STOCKMARKET_GETOFFERPRICE(3905), + STOCKMARKET_GETOFFERCOUNT(3906), + STOCKMARKET_GETOFFERCOMPLETEDCOUNT(3907), + STOCKMARKET_GETOFFERCOMPLETEDGOLD(3908), + STOCKMARKET_ISOFFEREMPTY(3910), + STOCKMARKET_ISOFFERSTABLE(3911), + STOCKMARKET_ISOFFERFINISHED(3912), + STOCKMARKET_ISOFFERADDING(3913), + TRADINGPOST_SORTBY_NAME(3914), + TRADINGPOST_SORTBY_PRICE(3915), + TRADINGPOST_SORTFILTERBY_WORLD(3916), + TRADINGPOST_SORTBY_AGE(3917), + TRADINGPOST_SORTBY_COUNT(3918), + TRADINGPOST_GETTOTALOFFERS(3919), + TRADINGPOST_GETOFFERWORLD(3920), + TRADINGPOST_GETOFFERNAME(3921), + TRADINGPOST_GETOFFERPREVIOUSNAME(3922), + TRADINGPOST_GETOFFERAGE(3923), + TRADINGPOST_GETOFFERCOUNT(3924), + TRADINGPOST_GETOFFERPRICE(3925), + TRADINGPOST_GETOFFERITEM(3926), + ADD(4000), + SUB(4001), + MULTIPLY(4002), + DIV(4003), + RANDOM(4004), + RANDOMINC(4005), + INTERPOLATE(4006), + ADDPERCENT(4007), + SETBIT(4008), + CLEARBIT(4009), + TESTBIT(4010), + MOD(4011), + POW(4012), + INVPOW(4013), + AND(4014), + OR(4015), + SCALE(4018), + APPEND_NUM(4100), + APPEND(4101), + APPEND_SIGNNUM(4102), + LOWERCASE(4103), + FROMDATE(4104), + TEXT_GENDER(4105), + TOSTRING(4106), + COMPARE(4107), + PARAHEIGHT(4108), + PARAWIDTH(4109), + TEXT_SWITCH(4110), + ESCAPE(4111), + APPEND_CHAR(4112), + CHAR_ISPRINTABLE(4113), + CHAR_ISALPHANUMERIC(4114), + CHAR_ISALPHA(4115), + CHAR_ISNUMERIC(4116), + STRING_LENGTH(4117), + SUBSTRING(4118), + REMOVETAGS(4119), + STRING_INDEXOF_CHAR(4120), + STRING_INDEXOF_STRING(4121), + UPPERCASE(4122), + OC_NAME(4200), + OC_OP(4201), + OC_IOP(4202), + OC_COST(4203), + OC_STACKABLE(4204), + OC_CERT(4205), + OC_UNCERT(4206), + OC_MEMBERS(4207), + OC_PLACEHOLDER(4208), + OC_UNPLACEHOLDER(4209), + OC_FIND(4210), + OC_FINDNEXT(4211), + OC_FINDRESET(4212), + CHAT_GETFILTER_PUBLIC(5000), + CHAT_SETFILTER(5001), + CHAT_SENDABUSEREPORT(5002), + CHAT_GETHISTORY_BYTYPEANDLINE(5003), + CHAT_GETHISTORY_BYUID(5004), + CHAT_GETFILTER_PRIVATE(5005), + CHAT_SENDPUBLIC(5008), + CHAT_SENDPRIVATE(5009), + CHAT_PLAYERNAME(5015), + CHAT_GETFILTER_TRADE(5016), + CHAT_GETHISTORYLENGTH(5017), + CHAT_GETNEXTUID(5018), + CHAT_GETPREVUID(5019), + DOCHEAT(5020), + CHAT_SETMESSAGEFILTER(5021), + CHAT_GETMESSAGEFILTER(5022), + GETWINDOWMODE(5306), + SETWINDOWMODE(5307), + GETDEFAULTWINDOWMODE(5308), + SETDEFAULTWINDOWMODE(5309), + CAM_FORCEANGLE(5504), + CAM_GETANGLE_XA(5505), + CAM_GETANGLE_YA(5506), + CAM_SETFOLLOWHEIGHT(5530), + CAM_GETFOLLOWHEIGHT(5531), + LOGOUT(5630), + VIEWPORT_SETFOV(6200), + VIEWPORT_SETZOOM(6201), + VIEWPORT_CLAMPFOV(6202), + VIEWPORT_GETEFFECTIVESIZE(6203), + VIEWPORT_GETZOOM(6204), + VIEWPORT_GETFOV(6205), + WORLDLIST_FETCH(6500), + WORLDLIST_START(6501), + WORLDLIST_NEXT(6502), + WORLDLIST_SPECIFIC(6506), + WORLDLIST_SORT(6507), + GETWORLDINFO(6511), + SETFOLLOWEROPSLOWPRIORITY(6512), + NC_PARAM(6513), + LC_PARAM(6514), + OC_PARAM(6515), + STRUCT_PARAM(6516), + ON_MOBILE(6518), + CLIENTTYPE(6519), + BATTERYLEVEL(6524), + BATTERYCHARGING(6525), + WIFIAVAILABLE(6526), + WORLDMAP_GETMAPNAME(6601), + WORLDMAP_SETMAP(6602), + WORLDMAP_GETZOOM(6603), + WORLDMAP_SETZOOM(6604), + WORLDMAP_ISLOADED(6605), + WORLDMAP_JUMPTODISPLAYCOORD(6606), + WORLDMAP_JUMPTODISPLAYCOORD_INSTANT(6607), + WORLDMAP_JUMPTOSOURCECOORD(6608), + WORLDMAP_JUMPTOSOURCECOORD_INSTANT(6609), + WORLDMAP_GETDISPLAYPOSITION(6610), + WORLDMAP_GETCONFIGORIGIN(6611), + WORLDMAP_GETCONFIGSIZE(6612), + WORLDMAP_GETCONFIGBOUNDS(6613), + WORLDMAP_GETCONFIGZOOM(6614), + WORLDMAP_GETCURRENTMAP(6616), + WORLDMAP_GETDISPLAYCOORD(6617), + WORLDMAP_COORDINMAP(6621), + WORLDMAP_GETSIZE(6622), + WORLDMAP_PERPETUALFLASH(6628), + WORLDMAP_FLASHELEMENT(6629), + WORLDMAP_FLASHELEMENTCATEGORY(6630), + WORLDMAP_STOPCURRENTFLASHES(6631), + WORLDMAP_DISABLEELEMENTS(6632), + WORLDMAP_DISABLEELEMENT(6633), + WORLDMAP_DISABLEELEMENTCATEGORY(6634), + WORLDMAP_GETDISABLEELEMENTS(6635), + WORLDMAP_GETDISABLEELEMENT(6636), + WORLDMAP_GETDISABLEELEMENTCATEGORY(6637), + WORLDMAP_LISTELEMENT_START(6639), + WORLDMAP_LISTELEMENT_NEXT(6640), + MEC_TEXT(6693), + MEC_TEXTSIZE(6694), + MEC_CATEGORY(6695), + MEC_SPRITE(6696); + + public final int opcode; + + ScriptOpcode(int opcode) + { + this.opcode = opcode; + } + + private static final Map map; + + static + { + ImmutableMap.Builder builder = ImmutableMap.builder(); + + for (ScriptOpcode value : values()) + { + builder.put(value.opcode, value); + } + + map = builder.build(); + } + + public static String nameFromID(int opcode) + { + ScriptOpcode op = map.get(opcode); + + if (op == null) + { + return null; + } + + return op.name(); + } +} diff --git a/deobfuscator/src/main/java/net/runelite/deob/updater/ParameterRenamer.java b/deobfuscator/src/main/java/net/runelite/deob/updater/ParameterRenamer.java index 4b2dbc78d0..dee849b75b 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/updater/ParameterRenamer.java +++ b/deobfuscator/src/main/java/net/runelite/deob/updater/ParameterRenamer.java @@ -24,9 +24,12 @@ */ package net.runelite.deob.updater; +import java.util.List; import net.runelite.asm.ClassFile; import net.runelite.asm.ClassGroup; import net.runelite.asm.Method; +import net.runelite.asm.attributes.code.LocalVariable; +import net.runelite.asm.attributes.code.Parameter; import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; public class ParameterRenamer @@ -49,9 +52,39 @@ public class ParameterRenamer for (Method sourceM : sourceCF.getMethods()) { Method destM = (Method) mapping.get(sourceM); - if (destM != null) + if (sourceM.getParameters() != null && !sourceM.getParameters().isEmpty() && destM.getParameters().size() >= 1) { - destM.setParameters(sourceM.getParameters()); + List oldParams = destM.getParameters(); + for (int i = 0; i < sourceM.getParameters().size(); i++) + { + String name = sourceM.getParameters().get(i).getName(); + if (name.matches("arg[0-9]") || name.length() <= 2 && (name.charAt(0) != 'x' || name.charAt(0) != 'y')) + { + continue; + } + + Parameter oldParam = oldParams.get(i); + LocalVariable oldVar = oldParam.getLocalVariable(); + + Parameter newParam = new Parameter(name, oldParam.getAccess()); + oldParams.set(i, newParam); + + if (oldVar == null) + { + continue; + } + + LocalVariable newVar = new LocalVariable( + name, + oldVar.getDesc(), + oldVar.getSignature(), + oldVar.getStart(), + oldVar.getEnd(), + oldVar.getIndex() + ); + + newParam.setLocalVariable(newVar); + } } } } diff --git a/deobfuscator/src/main/java/net/runelite/deob/updater/UpdateMappings.java b/deobfuscator/src/main/java/net/runelite/deob/updater/UpdateMappings.java index 0201caabb1..bceda1fe1b 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/updater/UpdateMappings.java +++ b/deobfuscator/src/main/java/net/runelite/deob/updater/UpdateMappings.java @@ -31,6 +31,7 @@ import net.runelite.deob.deobfuscators.mapping.AnnotationIntegrityChecker; import net.runelite.deob.deobfuscators.mapping.AnnotationMapper; import net.runelite.deob.deobfuscators.mapping.Mapper; import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; +import net.runelite.deob.deobfuscators.transformers.ScriptOpcodesTransformer; import net.runelite.deob.util.JarUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -72,6 +73,8 @@ public class UpdateMappings ParameterRenamer pr = new ParameterRenamer(group1, group2, mapping); pr.run(); + + new ScriptOpcodesTransformer().transform(group2); } public void save(File out) throws IOException diff --git a/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java b/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java index fe137ec096..dddc93c4d6 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java +++ b/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java @@ -1,5 +1,6 @@ package net.runelite.deob.updater; +import com.google.common.base.Strings; import java.io.File; import net.runelite.asm.ClassFile; import net.runelite.asm.ClassGroup; @@ -39,6 +40,12 @@ public class AnnotationCleaner log.debug("Checking {}", c.toString()); + String implementingName = DeobAnnotations.getImplements(c); + if (!Strings.isNullOrEmpty(implementingName)) + { + assertEquals(c + " implements " + implementingName + " but is called " + c.getClassName(), implementingName, c.getClassName()); + } + for (Field f : c.getFields()) { Annotations an = f.getAnnotations(); @@ -48,11 +55,11 @@ public class AnnotationCleaner if (exportedName == null) { - assertTrue("Field " + fieldName + " isn't obfuscated but doesn't have @Export.", Deob.isObfuscated(fieldName) || fieldName.contains("$")); + assertTrue("Field " + c.getClassName() + '.' + fieldName + " isn't obfuscated but doesn't have @Export.", Deob.isObfuscated(fieldName) || fieldName.equals(DeobAnnotations.getObfuscatedName(an)) || DeobAnnotations.getObfuscatedName(an) == null); continue; } - assertEquals("Field " + fieldName + " has " + exportedName + " in @Export", fieldName, exportedName); + assertEquals("Field " + c.getClassName() + '.' + fieldName + " has " + exportedName + " in @Export", fieldName, exportedName); } for (Method m : c.getMethods()) @@ -64,11 +71,11 @@ public class AnnotationCleaner if (exportedName == null) { - assertTrue("Method " + fieldName + " isn't obfuscated but doesn't have @Export.", Deob.isObfuscated(fieldName) || fieldName.endsWith("init>") || fieldName.equals("values") || fieldName.equals("valueOf") || fieldName.startsWith("compareTo") || fieldName.equals("equals") || fieldName.equals("hashCode") || fieldName.equals("compare")); + assertTrue("Method " + c.getClassName() + '.' + fieldName + " isn't obfuscated but doesn't have @Export.", Deob.isObfuscated(fieldName) || fieldName.equals(DeobAnnotations.getObfuscatedName(an)) || DeobAnnotations.getObfuscatedName(an) == null); continue; } - assertEquals("Method " + fieldName + " has " + exportedName + " in @Export", fieldName, exportedName); + assertEquals("Method " + c.getClassName() + '.' + fieldName + " has " + exportedName + " in @Export", fieldName, exportedName); } } } diff --git a/deobfuscator/src/test/java/net/runelite/deob/updater/UpdateMappingsTest.java b/deobfuscator/src/test/java/net/runelite/deob/updater/UpdateMappingsTest.java index 332e2e31b0..bb34282e22 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/updater/UpdateMappingsTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/updater/UpdateMappingsTest.java @@ -37,6 +37,7 @@ import net.runelite.deob.deobfuscators.mapping.AnnotationIntegrityChecker; import net.runelite.deob.deobfuscators.mapping.AnnotationMapper; import net.runelite.deob.deobfuscators.mapping.Mapper; import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; +import net.runelite.deob.deobfuscators.transformers.ScriptOpcodesTransformer; import net.runelite.deob.util.JarUtil; import org.junit.Assert; import org.junit.Ignore; @@ -87,6 +88,19 @@ public class UpdateMappingsTest check(group1, group2); } + @Test + @Ignore + public void testScriptopcodes() throws Exception + { + File client = new File("C:\\Users\\Lucas\\IdeaProjects\\runelitexxx\\client.jar"); + + ClassGroup group = JarUtil.loadJar(client); + + new ScriptOpcodesTransformer().transform(group); + + JarUtil.saveJar(group, new File("C:/Users/Lucas/Desktop/Apapapapapap.jar")); + } + private void unannotate(ClassGroup group) { for (ClassFile cf : group.getClasses()) diff --git a/deobfuscator/src/test/java/net/runelite/runesuite/HookClass.java b/deobfuscator/src/test/java/net/runelite/runesuite/HookClass.java index 5b7caf9d80..bec9caf813 100644 --- a/deobfuscator/src/test/java/net/runelite/runesuite/HookClass.java +++ b/deobfuscator/src/test/java/net/runelite/runesuite/HookClass.java @@ -8,7 +8,6 @@ public class HookClass @SerializedName("class") String clazz; String name; - int access; List fields; List methods; } diff --git a/deobfuscator/src/test/java/net/runelite/runesuite/HookField.java b/deobfuscator/src/test/java/net/runelite/runesuite/HookField.java index c5219be785..d7db94eab6 100644 --- a/deobfuscator/src/test/java/net/runelite/runesuite/HookField.java +++ b/deobfuscator/src/test/java/net/runelite/runesuite/HookField.java @@ -5,7 +5,6 @@ public class HookField String field; String owner; String name; - int access; @Override public String toString() diff --git a/deobfuscator/src/test/java/net/runelite/runesuite/HookImporter.java b/deobfuscator/src/test/java/net/runelite/runesuite/HookImporter.java index c4a7892a1f..5c78be64f1 100644 --- a/deobfuscator/src/test/java/net/runelite/runesuite/HookImporter.java +++ b/deobfuscator/src/test/java/net/runelite/runesuite/HookImporter.java @@ -39,6 +39,8 @@ import net.runelite.asm.Type; import net.runelite.asm.attributes.Annotations; import net.runelite.asm.attributes.annotation.Annotation; import net.runelite.asm.attributes.annotation.Element; +import net.runelite.asm.attributes.code.LocalVariable; +import net.runelite.asm.attributes.code.Parameter; import net.runelite.asm.signature.Signature; import net.runelite.asm.signature.util.VirtualMethods; import static net.runelite.deob.DeobAnnotations.EXPORT; @@ -97,7 +99,7 @@ public class HookImporter @Ignore public void importHooks() { - int classes = 0, fields = 0, methods = 0, access = 0; + int classes = 0, fields = 0, methods = 0, params = 0; NameMappings mappings = new NameMappings(); for (HookClass hc : hooks) @@ -107,12 +109,6 @@ public class HookImporter assert cf != null; - if (cf.getAccess() != hc.access) - { - cf.setAccess(hc.access); - ++access; - } - String implementsName = getAnnotation(cf.getAnnotations(), IMPLEMENTS); if (implementsName.isEmpty()) { @@ -122,23 +118,28 @@ public class HookImporter ++classes; } + if (!implementsName.isEmpty() && !implementsName.equals(hc.clazz)) + { + logger.info("Runestar calls class {} {}, while we call it {}", hc.name, hc.clazz, implementsName); + } + for (HookField fh : hc.fields) { + if (fh.field.startsWith("__")) + { + continue; + } + ClassFile cf2 = findClassWithObfuscatedName(fh.owner); assert cf2 != null; Field f = findFieldWithObfuscatedName(cf2, fh.name); if (f == null) { + logger.warn("Missing field {}", fh); // inlined constant maybe? continue; } - if (f.getAccessFlags() != fh.access) - { - f.setAccessFlags(fh.access); - ++access; - } - String exportedName = getAnnotation(f.getAnnotations(), EXPORT); if (exportedName.isEmpty()) { @@ -155,11 +156,20 @@ public class HookImporter mappings.map(f.getPoolField(), deobfuscatedFieldName); ++fields; } + + if (!exportedName.isEmpty() && !exportedName.equals(fh.field)) + { + logger.info("Runestar calls field {}.{} {}, while we call it {}", fh.owner, fh.name, fh.field, exportedName); + } } outer: for (HookMethod hm : hc.methods) { + if (hm.method.startsWith("__")) + { + continue; + } ClassFile cf2 = findClassWithObfuscatedName(hm.owner); assert cf2 != null; @@ -171,10 +181,40 @@ public class HookImporter continue; } - if (m.getAccessFlags() != hm.access) + if (hm.parameters != null && !hm.parameters.isEmpty() && m.getParameters().size() >= 1) { - m.setAccessFlags(hm.access); - ++access; + List oldParams = m.getParameters(); + for (int i = 0; i < hm.parameters.size(); i++) + { + String name = hm.parameters.get(i); + if (name.matches("arg[0-9]") || name.length() <= 2 && (name.charAt(0) != 'x' && name.charAt(0) != 'y')) + { + continue; + } + + Parameter oldParam = oldParams.get(i); + LocalVariable oldVar = oldParam.getLocalVariable(); + + Parameter newParam = new Parameter(name, oldParam.getAccess()); + oldParams.set(i, newParam); + params++; + + if (oldVar == null) + { + continue; + } + + LocalVariable newVar = new LocalVariable( + name, + oldVar.getDesc(), + oldVar.getSignature(), + oldVar.getStart(), + oldVar.getEnd(), + oldVar.getIndex() + ); + + newParam.setLocalVariable(newVar); + } } // maybe only the base class method is exported @@ -184,6 +224,10 @@ public class HookImporter String exportedName = getAnnotation(method.getAnnotations(), EXPORT); if (!exportedName.isEmpty()) { + if (!exportedName.equals(hm.method)) + { + logger.info("Runestar calls {}.{} {}, while we call it {}", hm.owner, hm.name, hm.method, exportedName); + } continue outer; } } @@ -198,7 +242,7 @@ public class HookImporter Renamer renamer = new Renamer(mappings); renamer.run(group); - logger.info("Imported {} classes, {} fields, {} methods, {} access levels", classes, fields, methods, access); + logger.info("Imported {} classes, {} fields, {} methods, {} params", classes, fields, methods, params); } private ClassFile findClassWithObfuscatedName(String name) @@ -259,8 +303,7 @@ public class HookImporter { for (Element e : a.getElements()) { - String str = (String) e.getValue(); - return str; + return (String) e.getValue(); } } @@ -270,13 +313,13 @@ public class HookImporter private Signature getObfuscatedMethodSignature(Method method) { String sig = getAnnotation(method.getAnnotations(), OBFUSCATED_SIGNATURE); - if (sig.isEmpty() == false) - { - return new Signature(sig); // if it is annotated, use that - } - else + if (sig.isEmpty()) { return method.getDescriptor(); } + else + { + return new Signature(sig); // if it is annotated, use that + } } } diff --git a/deobfuscator/src/test/java/net/runelite/runesuite/HookMethod.java b/deobfuscator/src/test/java/net/runelite/runesuite/HookMethod.java index 849c0d01c7..172917a565 100644 --- a/deobfuscator/src/test/java/net/runelite/runesuite/HookMethod.java +++ b/deobfuscator/src/test/java/net/runelite/runesuite/HookMethod.java @@ -1,12 +1,13 @@ package net.runelite.runesuite; +import java.util.List; + public class HookMethod { String method; String owner; String name; - int access; - String[] parameters; + List parameters; String descriptor; @Override diff --git a/deobfuscator/src/test/java/net/runelite/runesuite/hooks.json b/deobfuscator/src/test/java/net/runelite/runesuite/hooks.json index e36464b4e9..56b4ddb42b 100644 --- a/deobfuscator/src/test/java/net/runelite/runesuite/hooks.json +++ b/deobfuscator/src/test/java/net/runelite/runesuite/hooks.json @@ -1,339 +1,12 @@ [ { - "class" : "UrlRequest", - "name" : "ey", + "class" : "Formatting", + "name" : "cy", "super" : "java.lang.Object", "access" : 33, "interfaces" : [ ], - "fields" : [ { - "field" : "isDone0", - "owner" : "ey", - "name" : "f", - "access" : 64, - "descriptor" : "Z" - }, { - "field" : "response0", - "owner" : "ey", - "name" : "q", - "access" : 64, - "descriptor" : "[B" - }, { - "field" : "url", - "owner" : "ey", - "name" : "m", - "access" : 16, - "descriptor" : "Ljava/net/URL;" - } ], - "methods" : [ { - "method" : "getResponse", - "owner" : "ey", - "name" : "f", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)[B" - }, { - "method" : "isDone", - "owner" : "ey", - "name" : "m", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)Z" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Ljava/net/URL;)V" - } ] -}, { - "class" : "ClientParameter", - "name" : "ji", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "id", - "owner" : "ji", - "name" : "y", - "access" : 17, - "descriptor" : "Ljava/lang/String;" - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Ljava/lang/String;Ljava/lang/String;)V" - } ] -}, { - "class" : "Usernamed", - "name" : "ky", - "super" : "java.lang.Object", - "access" : 1537, - "interfaces" : [ ], "fields" : [ ], - "methods" : [ { - "method" : "username", - "owner" : "ky", - "name" : "kr", - "access" : 1025, - "descriptor" : "(B)Lkp;" - } ], + "methods" : [ ], "constructors" : [ ] -}, { - "class" : "WorldMapLabel", - "name" : "aj", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "height", - "owner" : "aj", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : -85027761 - }, { - "field" : "size", - "owner" : "aj", - "name" : "w", - "access" : 0, - "descriptor" : "Ls;" - }, { - "field" : "text", - "owner" : "aj", - "name" : "m", - "access" : 0, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "width", - "owner" : "aj", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : -471061617 - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Ljava/lang/String;IILs;)V" - } ] -}, { - "class" : "Canvas", - "name" : "ao", - "super" : "java.awt.Canvas", - "access" : 49, - "interfaces" : [ ], - "fields" : [ { - "field" : "component", - "owner" : "ao", - "name" : "m", - "access" : 0, - "descriptor" : "Ljava/awt/Component;" - } ], - "methods" : [ { - "method" : "paint", - "owner" : "ao", - "name" : "paint", - "access" : 17, - "parameters" : [ "g" ], - "descriptor" : "(Ljava/awt/Graphics;)V" - }, { - "method" : "update", - "owner" : "ao", - "name" : "update", - "access" : 17, - "parameters" : [ "g" ], - "descriptor" : "(Ljava/awt/Graphics;)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Ljava/awt/Component;)V" - } ] -}, { - "class" : "SoundEnvelope", - "name" : "de", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "amplitude", - "owner" : "de", - "name" : "d", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "durations", - "owner" : "de", - "name" : "f", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "end", - "owner" : "de", - "name" : "o", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "form", - "owner" : "de", - "name" : "u", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "max", - "owner" : "de", - "name" : "k", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "phaseIndex", - "owner" : "de", - "name" : "l", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "phases", - "owner" : "de", - "name" : "q", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "segments", - "owner" : "de", - "name" : "m", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "start", - "owner" : "de", - "name" : "w", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "step", - "owner" : "de", - "name" : "e", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "ticks", - "owner" : "de", - "name" : "g", - "access" : 0, - "descriptor" : "I" - } ], - "methods" : [ { - "method" : "decode", - "owner" : "de", - "name" : "m", - "access" : 16, - "parameters" : [ "buffer" ], - "descriptor" : "(Lgr;)V" - }, { - "method" : "decodeSegments", - "owner" : "de", - "name" : "f", - "access" : 16, - "parameters" : [ "buffer" ], - "descriptor" : "(Lgr;)V" - }, { - "method" : "doStep", - "owner" : "de", - "name" : "w", - "access" : 16, - "parameters" : [ "n" ], - "descriptor" : "(I)I" - }, { - "method" : "reset", - "owner" : "de", - "name" : "q", - "access" : 16, - "parameters" : [ ], - "descriptor" : "()V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "ServerPacket", - "name" : "ge", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "id", - "owner" : "ge", - "name" : "cu", - "access" : 17, - "descriptor" : "I", - "decoder" : 1117211673 - }, { - "field" : "length", - "owner" : "ge", - "name" : "cb", - "access" : 17, - "descriptor" : "I", - "decoder" : 947096829 - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(II)V" - } ] -}, { - "class" : "ModelData0", - "name" : "ed", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "SecureRandomFuture", - "name" : "cn", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "executor", - "owner" : "cn", - "name" : "m", - "access" : 0, - "descriptor" : "Ljava/util/concurrent/ExecutorService;" - }, { - "field" : "future", - "owner" : "cn", - "name" : "f", - "access" : 0, - "descriptor" : "Ljava/util/concurrent/Future;" - } ], - "methods" : [ { - "method" : "get", - "owner" : "cn", - "name" : "q", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)Ljava/security/SecureRandom;" - }, { - "method" : "isDone", - "owner" : "cn", - "name" : "f", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)Z" - }, { - "method" : "shutdown", - "owner" : "cn", - "name" : "m", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] }, { "class" : "Task", "name" : "fm", @@ -383,6 +56,86 @@ "access" : 0, "descriptor" : "()V" } ] +}, { + "class" : "GzipDecompressor", + "name" : "go", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "inflater", + "owner" : "go", + "name" : "m", + "access" : 0, + "descriptor" : "Ljava/util/zip/Inflater;" + } ], + "methods" : [ { + "method" : "decompress", + "owner" : "go", + "name" : "m", + "access" : 1, + "descriptor" : "(Lgr;[BB)V" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "()V" + }, { + "access" : 0, + "descriptor" : "(III)V" + } ] +}, { + "class" : "AbstractRasterProvider", + "name" : "lp", + "super" : "java.lang.Object", + "access" : 1057, + "interfaces" : [ ], + "fields" : [ { + "field" : "height", + "owner" : "lp", + "name" : "o", + "access" : 1, + "descriptor" : "I", + "decoder" : -239960145 + }, { + "field" : "pixels", + "owner" : "lp", + "name" : "q", + "access" : 1, + "descriptor" : "[I" + }, { + "field" : "width", + "owner" : "lp", + "name" : "w", + "access" : 1, + "descriptor" : "I", + "decoder" : -560298363 + } ], + "methods" : [ { + "method" : "apply", + "owner" : "lp", + "name" : "b", + "access" : 17, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "draw", + "owner" : "lp", + "name" : "q", + "access" : 1025, + "parameters" : [ "x", "y", "width", "height" ], + "descriptor" : "(IIIIB)V" + }, { + "method" : "drawFull", + "owner" : "lp", + "name" : "f", + "access" : 1025, + "parameters" : [ "x", "y" ], + "descriptor" : "(III)V" + } ], + "constructors" : [ { + "access" : 4, + "descriptor" : "()V" + } ] }, { "class" : "Clock", "name" : "fa", @@ -410,39 +163,361 @@ "descriptor" : "()V" } ] }, { - "class" : "ServerBuild", - "name" : "iy", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "id", - "owner" : "iy", - "name" : "u", - "access" : 17, - "descriptor" : "I", - "decoder" : -947415971 - }, { - "field" : "name", - "owner" : "iy", - "name" : "o", - "access" : 17, - "descriptor" : "Ljava/lang/String;" - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Ljava/lang/String;I)V" - } ] -}, { - "class" : "Formatting", - "name" : "cy", + "class" : "ByteArrayPool", + "name" : "gi", "super" : "java.lang.Object", "access" : 33, "interfaces" : [ ], "fields" : [ ], "methods" : [ ], "constructors" : [ ] +}, { + "class" : "DevicePcmPlayer", + "name" : "ax", + "super" : "co", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "byteSamples", + "owner" : "ax", + "name" : "w", + "access" : 0, + "descriptor" : "[B" + }, { + "field" : "capacity2", + "owner" : "ax", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : -106586673 + }, { + "field" : "format", + "owner" : "ax", + "name" : "m", + "access" : 0, + "descriptor" : "Ljavax/sound/sampled/AudioFormat;" + }, { + "field" : "line", + "owner" : "ax", + "name" : "f", + "access" : 0, + "descriptor" : "Ljavax/sound/sampled/SourceDataLine;" + } ], + "methods" : [ { + "method" : "close", + "owner" : "ax", + "name" : "o", + "access" : 4, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "discard", + "owner" : "ax", + "name" : "u", + "access" : 4, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "init", + "owner" : "ax", + "name" : "m", + "access" : 4, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "open", + "owner" : "ax", + "name" : "f", + "access" : 4, + "parameters" : [ "bufferSize" ], + "descriptor" : "(II)V" + }, { + "method" : "position", + "owner" : "ax", + "name" : "q", + "access" : 4, + "parameters" : [ ], + "descriptor" : "(B)I" + }, { + "method" : "write", + "owner" : "ax", + "name" : "w", + "access" : 4, + "parameters" : [ ], + "descriptor" : "()V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "Canvas", + "name" : "ao", + "super" : "java.awt.Canvas", + "access" : 49, + "interfaces" : [ ], + "fields" : [ { + "field" : "component", + "owner" : "ao", + "name" : "m", + "access" : 0, + "descriptor" : "Ljava/awt/Component;" + } ], + "methods" : [ { + "method" : "paint", + "owner" : "ao", + "name" : "paint", + "access" : 17, + "parameters" : [ "g" ], + "descriptor" : "(Ljava/awt/Graphics;)V" + }, { + "method" : "update", + "owner" : "ao", + "name" : "update", + "access" : 17, + "parameters" : [ "g" ], + "descriptor" : "(Ljava/awt/Graphics;)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Ljava/awt/Component;)V" + } ] +}, { + "class" : "ClientParameter", + "name" : "ji", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "id", + "owner" : "ji", + "name" : "y", + "access" : 17, + "descriptor" : "Ljava/lang/String;" + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Ljava/lang/String;Ljava/lang/String;)V" + } ] +}, { + "class" : "MenuAction", + "name" : "cs", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "action", + "owner" : "cs", + "name" : "o", + "access" : 0, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "argument0", + "owner" : "cs", + "name" : "w", + "access" : 0, + "descriptor" : "I", + "decoder" : -2057883817 + }, { + "field" : "argument1", + "owner" : "cs", + "name" : "m", + "access" : 0, + "descriptor" : "I", + "decoder" : 305977315 + }, { + "field" : "argument2", + "owner" : "cs", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : 1764645917 + }, { + "field" : "opcode", + "owner" : "cs", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : -1483856253 + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "ClientPacket", + "name" : "gs", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ "gb" ], + "fields" : [ { + "field" : "id", + "owner" : "gs", + "name" : "cd", + "access" : 16, + "descriptor" : "I", + "decoder" : -286923745 + }, { + "field" : "length", + "owner" : "gs", + "name" : "cx", + "access" : 16, + "descriptor" : "I", + "decoder" : -1759434223 + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(II)V" + } ] +}, { + "class" : "TilePaint", + "name" : "eb", + "super" : "java.lang.Object", + "access" : 49, + "interfaces" : [ ], + "fields" : [ { + "field" : "isFlat", + "owner" : "eb", + "name" : "u", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "neColor", + "owner" : "eb", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : -1668262341 + }, { + "field" : "nwColor", + "owner" : "eb", + "name" : "w", + "access" : 0, + "descriptor" : "I", + "decoder" : -1057776035 + }, { + "field" : "rgb", + "owner" : "eb", + "name" : "g", + "access" : 0, + "descriptor" : "I", + "decoder" : 2097947337 + }, { + "field" : "seColor", + "owner" : "eb", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : -1875844515 + }, { + "field" : "swColor", + "owner" : "eb", + "name" : "m", + "access" : 0, + "descriptor" : "I", + "decoder" : 181759449 + }, { + "field" : "texture", + "owner" : "eb", + "name" : "o", + "access" : 0, + "descriptor" : "I", + "decoder" : 463308567 + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(IIIIIIZ)V" + } ] +}, { + "class" : "AbstractByteArrayCopier", + "name" : "gu", + "super" : "java.lang.Object", + "access" : 1057, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ { + "method" : "get", + "owner" : "gu", + "name" : "m", + "access" : 1024, + "parameters" : [ ], + "descriptor" : "(I)[B" + }, { + "method" : "set", + "owner" : "gu", + "name" : "f", + "access" : 1024, + "parameters" : [ "array" ], + "descriptor" : "([BI)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "ModelData0", + "name" : "ed", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "Varps", + "name" : "hv", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ ], + "constructors" : [ ] +}, { + "class" : "Strings", + "name" : "id", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ ], + "constructors" : [ ] +}, { + "class" : "WorldMapCacheName", + "name" : "aw", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "name", + "owner" : "aw", + "name" : "u", + "access" : 17, + "descriptor" : "Ljava/lang/String;" + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Ljava/lang/String;)V" + } ] +}, { + "class" : "TriBool", + "name" : "kd", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] }, { "class" : "Decimator", "name" : "dp", @@ -496,24 +571,30 @@ "descriptor" : "(II)V" } ] }, { - "class" : "AbstractByteArrayCopier", - "name" : "gu", - "super" : "java.lang.Object", - "access" : 1057, + "class" : "DirectByteArrayCopier", + "name" : "gv", + "super" : "gu", + "access" : 33, "interfaces" : [ ], - "fields" : [ ], + "fields" : [ { + "field" : "directBuffer", + "owner" : "gv", + "name" : "m", + "access" : 0, + "descriptor" : "Ljava/nio/ByteBuffer;" + } ], "methods" : [ { "method" : "get", - "owner" : "gu", + "owner" : "gv", "name" : "m", - "access" : 1024, + "access" : 0, "parameters" : [ ], "descriptor" : "(I)[B" }, { "method" : "set", - "owner" : "gu", + "owner" : "gv", "name" : "f", - "access" : 1024, + "access" : 0, "parameters" : [ "array" ], "descriptor" : "([BI)V" } ], @@ -646,110 +727,197 @@ "descriptor" : "()V" } ] }, { - "class" : "DevicePcmPlayer", - "name" : "ax", - "super" : "co", + "class" : "Usernamed", + "name" : "ky", + "super" : "java.lang.Object", + "access" : 1537, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ { + "method" : "username", + "owner" : "ky", + "name" : "kr", + "access" : 1025, + "descriptor" : "(B)Lkp;" + } ], + "constructors" : [ ] +}, { + "class" : "SecureRandomFuture", + "name" : "cn", + "super" : "java.lang.Object", "access" : 33, "interfaces" : [ ], "fields" : [ { - "field" : "byteSamples", - "owner" : "ax", - "name" : "w", - "access" : 0, - "descriptor" : "[B" - }, { - "field" : "capacity2", - "owner" : "ax", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : -106586673 - }, { - "field" : "format", - "owner" : "ax", + "field" : "executor", + "owner" : "cn", "name" : "m", "access" : 0, - "descriptor" : "Ljavax/sound/sampled/AudioFormat;" + "descriptor" : "Ljava/util/concurrent/ExecutorService;" }, { - "field" : "line", - "owner" : "ax", + "field" : "future", + "owner" : "cn", "name" : "f", "access" : 0, - "descriptor" : "Ljavax/sound/sampled/SourceDataLine;" + "descriptor" : "Ljava/util/concurrent/Future;" } ], "methods" : [ { - "method" : "close", - "owner" : "ax", - "name" : "o", - "access" : 4, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "discard", - "owner" : "ax", - "name" : "u", - "access" : 4, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "init", - "owner" : "ax", - "name" : "m", - "access" : 4, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "open", - "owner" : "ax", - "name" : "f", - "access" : 4, - "parameters" : [ "bufferSize" ], - "descriptor" : "(II)V" - }, { - "method" : "position", - "owner" : "ax", + "method" : "get", + "owner" : "cn", "name" : "q", - "access" : 4, + "access" : 0, "parameters" : [ ], - "descriptor" : "(B)I" + "descriptor" : "(I)Ljava/security/SecureRandom;" }, { - "method" : "write", - "owner" : "ax", - "name" : "w", - "access" : 4, + "method" : "isDone", + "owner" : "cn", + "name" : "f", + "access" : 0, "parameters" : [ ], - "descriptor" : "()V" + "descriptor" : "(I)Z" + }, { + "method" : "shutdown", + "owner" : "cn", + "name" : "m", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" } ], "constructors" : [ { "access" : 0, "descriptor" : "()V" } ] }, { - "class" : "ClientPacket", - "name" : "gs", + "class" : "ServerPacket", + "name" : "ge", "super" : "java.lang.Object", "access" : 33, - "interfaces" : [ "gb" ], + "interfaces" : [ ], "fields" : [ { "field" : "id", - "owner" : "gs", - "name" : "cd", - "access" : 16, + "owner" : "ge", + "name" : "cu", + "access" : 17, "descriptor" : "I", - "decoder" : -286923745 + "decoder" : 1117211673 }, { "field" : "length", - "owner" : "gs", - "name" : "cx", - "access" : 16, + "owner" : "ge", + "name" : "cb", + "access" : 17, "descriptor" : "I", - "decoder" : -1759434223 + "decoder" : 947096829 } ], "methods" : [ ], "constructors" : [ { "access" : 0, "descriptor" : "(II)V" } ] +}, { + "class" : "UrlRequest", + "name" : "ey", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "isDone0", + "owner" : "ey", + "name" : "f", + "access" : 64, + "descriptor" : "Z" + }, { + "field" : "response0", + "owner" : "ey", + "name" : "q", + "access" : 64, + "descriptor" : "[B" + }, { + "field" : "url", + "owner" : "ey", + "name" : "m", + "access" : 16, + "descriptor" : "Ljava/net/URL;" + } ], + "methods" : [ { + "method" : "getResponse", + "owner" : "ey", + "name" : "f", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)[B" + }, { + "method" : "isDone", + "owner" : "ey", + "name" : "m", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)Z" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Ljava/net/URL;)V" + } ] +}, { + "class" : "WorldMapLabel", + "name" : "aj", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "height", + "owner" : "aj", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : -85027761 + }, { + "field" : "size", + "owner" : "aj", + "name" : "w", + "access" : 0, + "descriptor" : "Ls;" + }, { + "field" : "text", + "owner" : "aj", + "name" : "m", + "access" : 0, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "width", + "owner" : "aj", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : -471061617 + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Ljava/lang/String;IILs;)V" + } ] +}, { + "class" : "RunException", + "name" : "fx", + "super" : "java.lang.RuntimeException", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "string", + "owner" : "fx", + "name" : "o", + "access" : 0, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "throwable", + "owner" : "fx", + "name" : "u", + "access" : 0, + "descriptor" : "Ljava/lang/Throwable;" + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Ljava/lang/Throwable;Ljava/lang/String;)V" + } ] }, { "class" : "Node", "name" : "gw", @@ -795,284 +963,161 @@ "descriptor" : "()V" } ] }, { - "class" : "NodeHashTable", - "name" : "ld", + "class" : "DefaultsGroup", + "name" : "ka", "super" : "java.lang.Object", - "access" : 49, + "access" : 33, "interfaces" : [ ], "fields" : [ { - "field" : "buckets", - "owner" : "ld", + "field" : "group", + "owner" : "ka", "name" : "f", - "access" : 0, - "descriptor" : "[Lgw;" - }, { - "field" : "current", - "owner" : "ld", - "name" : "w", - "access" : 0, - "descriptor" : "Lgw;" - }, { - "field" : "currentGet", - "owner" : "ld", - "name" : "q", - "access" : 0, - "descriptor" : "Lgw;" - }, { - "field" : "index", - "owner" : "ld", - "name" : "o", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "size", - "owner" : "ld", - "name" : "m", - "access" : 0, - "descriptor" : "I" - } ], - "methods" : [ { - "method" : "clear", - "owner" : "ld", - "name" : "q", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "first", - "owner" : "ld", - "name" : "w", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()Lgw;" - }, { - "method" : "get", - "owner" : "ld", - "name" : "m", - "access" : 1, - "parameters" : [ "key" ], - "descriptor" : "(J)Lgw;" - }, { - "method" : "next", - "owner" : "ld", - "name" : "o", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()Lgw;" - }, { - "method" : "put", - "owner" : "ld", - "name" : "f", - "access" : 1, - "parameters" : [ "node", "key" ], - "descriptor" : "(Lgw;J)V" + "access" : 16, + "descriptor" : "I", + "decoder" : -800980069 } ], + "methods" : [ ], "constructors" : [ { - "access" : 1, + "access" : 0, "descriptor" : "(I)V" } ] }, { - "class" : "TilePaint", - "name" : "eb", + "class" : "SoundEnvelope", + "name" : "de", "super" : "java.lang.Object", - "access" : 49, + "access" : 33, "interfaces" : [ ], "fields" : [ { - "field" : "isFlat", - "owner" : "eb", + "field" : "amplitude", + "owner" : "de", + "name" : "d", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "durations", + "owner" : "de", + "name" : "f", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "end", + "owner" : "de", + "name" : "o", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "form", + "owner" : "de", "name" : "u", "access" : 0, - "descriptor" : "Z" + "descriptor" : "I" }, { - "field" : "neColor", - "owner" : "eb", + "field" : "max", + "owner" : "de", + "name" : "k", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "phaseIndex", + "owner" : "de", + "name" : "l", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "phases", + "owner" : "de", "name" : "q", "access" : 0, - "descriptor" : "I", - "decoder" : -1668262341 + "descriptor" : "[I" }, { - "field" : "nwColor", - "owner" : "eb", + "field" : "segments", + "owner" : "de", + "name" : "m", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "start", + "owner" : "de", "name" : "w", "access" : 0, - "descriptor" : "I", - "decoder" : -1057776035 + "descriptor" : "I" }, { - "field" : "rgb", - "owner" : "eb", + "field" : "step", + "owner" : "de", + "name" : "e", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "ticks", + "owner" : "de", "name" : "g", "access" : 0, - "descriptor" : "I", - "decoder" : 2097947337 - }, { - "field" : "seColor", - "owner" : "eb", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : -1875844515 - }, { - "field" : "swColor", - "owner" : "eb", - "name" : "m", - "access" : 0, - "descriptor" : "I", - "decoder" : 181759449 - }, { - "field" : "texture", - "owner" : "eb", - "name" : "o", - "access" : 0, - "descriptor" : "I", - "decoder" : 463308567 + "descriptor" : "I" } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(IIIIIIZ)V" - } ] -}, { - "class" : "MenuAction", - "name" : "cs", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "action", - "owner" : "cs", - "name" : "o", - "access" : 0, - "descriptor" : "Ljava/lang/String;" + "methods" : [ { + "method" : "decode", + "owner" : "de", + "name" : "m", + "access" : 16, + "parameters" : [ "buffer" ], + "descriptor" : "(Lgr;)V" }, { - "field" : "argument0", - "owner" : "cs", + "method" : "decodeSegments", + "owner" : "de", + "name" : "f", + "access" : 16, + "parameters" : [ "buffer" ], + "descriptor" : "(Lgr;)V" + }, { + "method" : "doStep", + "owner" : "de", "name" : "w", - "access" : 0, - "descriptor" : "I", - "decoder" : -2057883817 + "access" : 16, + "parameters" : [ "n" ], + "descriptor" : "(I)I" }, { - "field" : "argument1", - "owner" : "cs", - "name" : "m", - "access" : 0, - "descriptor" : "I", - "decoder" : 305977315 - }, { - "field" : "argument2", - "owner" : "cs", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : 1764645917 - }, { - "field" : "opcode", - "owner" : "cs", + "method" : "reset", + "owner" : "de", "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : -1483856253 + "access" : 16, + "parameters" : [ ], + "descriptor" : "()V" } ], - "methods" : [ ], "constructors" : [ { "access" : 0, "descriptor" : "()V" } ] }, { - "class" : "GzipDecompressor", - "name" : "go", - "super" : "java.lang.Object", + "class" : "FriendLoginUpdate", + "name" : "kn", + "super" : "gh", "access" : 33, "interfaces" : [ ], "fields" : [ { - "field" : "inflater", - "owner" : "go", - "name" : "m", - "access" : 0, - "descriptor" : "Ljava/util/zip/Inflater;" - } ], - "methods" : [ { - "method" : "decompress", - "owner" : "go", - "name" : "m", - "access" : 1, - "descriptor" : "(Lgr;[BB)V" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "()V" - }, { - "access" : 0, - "descriptor" : "(III)V" - } ] -}, { - "class" : "SoundCache", - "name" : "dt", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "musicSampleIndex", - "owner" : "dt", - "name" : "f", - "access" : 0, - "descriptor" : "Lir;" - }, { - "field" : "musicSamples", - "owner" : "dt", - "name" : "q", - "access" : 0, - "descriptor" : "Lld;" - }, { - "field" : "rawSounds", - "owner" : "dt", - "name" : "w", - "access" : 0, - "descriptor" : "Lld;" - }, { - "field" : "soundEffectIndex", - "owner" : "dt", - "name" : "m", - "access" : 0, - "descriptor" : "Lir;" - } ], - "methods" : [ { - "method" : "getMusicSample", - "owner" : "dt", - "name" : "w", - "access" : 1, - "descriptor" : "(I[II)Lcx;" - }, { - "method" : "getMusicSample0", - "owner" : "dt", - "name" : "f", - "access" : 0, - "descriptor" : "(II[II)Lcx;" - }, { - "method" : "getSoundEffect", - "owner" : "dt", + "field" : "time", + "owner" : "kn", "name" : "q", "access" : 1, - "descriptor" : "(I[IB)Lcx;" + "descriptor" : "I", + "decoder" : -1390885889 }, { - "method" : "getSoundEffect0", - "owner" : "dt", - "name" : "m", - "access" : 0, - "descriptor" : "(II[IS)Lcx;" - } ], - "constructors" : [ { + "field" : "username", + "owner" : "kn", + "name" : "w", "access" : 1, - "descriptor" : "(Lir;Lir;)V" - } ] -}, { - "class" : "Strings", - "name" : "id", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ ], + "descriptor" : "Lkp;" + }, { + "field" : "world", + "owner" : "kn", + "name" : "o", + "access" : 1, + "descriptor" : "S" + } ], "methods" : [ ], - "constructors" : [ ] + "constructors" : [ { + "access" : 0, + "descriptor" : "(Lkp;I)V" + } ] }, { "class" : "GrandExchangeEvents", "name" : "g", @@ -1098,22 +1143,301 @@ "descriptor" : "(Lgr;Z)V" } ] }, { - "class" : "ObjectNode", - "name" : "fk", + "class" : "ServerBuild", + "name" : "iy", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "id", + "owner" : "iy", + "name" : "u", + "access" : 17, + "descriptor" : "I", + "decoder" : -947415971 + }, { + "field" : "name", + "owner" : "iy", + "name" : "o", + "access" : 17, + "descriptor" : "Ljava/lang/String;" + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Ljava/lang/String;I)V" + } ] +}, { + "class" : "ItemContainer", + "name" : "bc", "super" : "gw", "access" : 33, "interfaces" : [ ], "fields" : [ { - "field" : "obj", - "owner" : "fk", - "name" : "m", + "field" : "ids", + "owner" : "bc", + "name" : "f", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "quantities", + "owner" : "bc", + "name" : "q", + "access" : 0, + "descriptor" : "[I" + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "StudioGame", + "name" : "is", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ "gc" ], + "fields" : [ { + "field" : "id", + "owner" : "is", + "name" : "l", + "access" : 16, + "descriptor" : "I", + "decoder" : -1688917715 + }, { + "field" : "name", + "owner" : "is", + "name" : "g", "access" : 17, - "descriptor" : "Ljava/lang/Object;" + "descriptor" : "Ljava/lang/String;" + } ], + "methods" : [ { + "method" : "ordinal", + "owner" : "is", + "name" : "f", + "access" : 1, + "descriptor" : "(B)I" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Ljava/lang/String;Ljava/lang/String;I)V" + } ] +}, { + "class" : "ByteArrayNode", + "name" : "gp", + "super" : "gw", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "byteArray", + "owner" : "gp", + "name" : "m", + "access" : 1, + "descriptor" : "[B" } ], "methods" : [ ], "constructors" : [ { "access" : 1, - "descriptor" : "(Ljava/lang/Object;)V" + "descriptor" : "([B)V" + } ] +}, { + "class" : "NanoClock", + "name" : "fp", + "super" : "fa", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "lastTimeNano", + "owner" : "fp", + "name" : "m", + "access" : 0, + "descriptor" : "J", + "decoder" : 7586221391557635221 + } ], + "methods" : [ { + "method" : "mark", + "owner" : "fp", + "name" : "m", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)V" + }, { + "method" : "wait", + "owner" : "fp", + "name" : "f", + "access" : 1, + "parameters" : [ "cycleMs", "minSleepMs" ], + "descriptor" : "(III)I" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "()V" + } ] +}, { + "class" : "RasterProvider", + "name" : "ai", + "super" : "lp", + "access" : 49, + "interfaces" : [ ], + "fields" : [ { + "field" : "component0", + "owner" : "ai", + "name" : "m", + "access" : 0, + "descriptor" : "Ljava/awt/Component;" + }, { + "field" : "image", + "owner" : "ai", + "name" : "f", + "access" : 0, + "descriptor" : "Ljava/awt/Image;" + } ], + "methods" : [ { + "method" : "draw", + "owner" : "ai", + "name" : "q", + "access" : 17, + "parameters" : [ "x", "y", "width", "height" ], + "descriptor" : "(IIIIB)V" + }, { + "method" : "draw0", + "owner" : "ai", + "name" : "o", + "access" : 16, + "parameters" : [ "graphics", "x", "y", "width", "height" ], + "descriptor" : "(Ljava/awt/Graphics;IIIIB)V" + }, { + "method" : "drawFull", + "owner" : "ai", + "name" : "f", + "access" : 17, + "parameters" : [ "x", "y" ], + "descriptor" : "(III)V" + }, { + "method" : "drawFull0", + "owner" : "ai", + "name" : "w", + "access" : 16, + "parameters" : [ "graphics", "x", "y" ], + "descriptor" : "(Ljava/awt/Graphics;III)V" + }, { + "method" : "setComponent", + "owner" : "ai", + "name" : "m", + "access" : 16, + "descriptor" : "(Ljava/awt/Component;B)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(IILjava/awt/Component;)V" + } ] +}, { + "class" : "MouseWheel", + "name" : "fv", + "super" : "java.lang.Object", + "access" : 1537, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ { + "method" : "useRotation", + "owner" : "fv", + "name" : "q", + "access" : 1025, + "parameters" : [ ], + "descriptor" : "(I)I" + } ], + "constructors" : [ ] +}, { + "class" : "WorldMapArchiveLoader", + "name" : "ls", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "archive", + "owner" : "ls", + "name" : "u", + "access" : 0, + "descriptor" : "Lir;" + }, { + "field" : "cacheName", + "owner" : "ls", + "name" : "o", + "access" : 0, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "isLoaded0", + "owner" : "ls", + "name" : "l", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "percentLoaded0", + "owner" : "ls", + "name" : "g", + "access" : 0, + "descriptor" : "I", + "decoder" : 624113115 + } ], + "methods" : [ { + "method" : "isLoaded", + "owner" : "ls", + "name" : "q", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(S)Z" + }, { + "method" : "load", + "owner" : "ls", + "name" : "f", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "percentLoaded", + "owner" : "ls", + "name" : "w", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "reset", + "owner" : "ls", + "name" : "m", + "access" : 0, + "parameters" : [ "cacheName" ], + "descriptor" : "(Ljava/lang/String;I)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Lir;)V" + } ] +}, { + "class" : "ClientPacketMarker", + "name" : "gb", + "super" : "java.lang.Object", + "access" : 1537, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ ], + "constructors" : [ ] +}, { + "class" : "AbstractSound", + "name" : "dd", + "super" : "gw", + "access" : 1057, + "interfaces" : [ ], + "fields" : [ { + "field" : "position", + "owner" : "dd", + "name" : "u", + "access" : 0, + "descriptor" : "I" + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" } ] }, { "class" : "NodeDeque", @@ -1202,1369 +1526,6 @@ "access" : 1, "descriptor" : "()V" } ] -}, { - "class" : "Bzip2Decompressor", - "name" : "gk", - "super" : "java.lang.Object", - "access" : 49, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ ], - "constructors" : [ ] -}, { - "class" : "IntegerNode", - "name" : "gn", - "super" : "gw", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "integer", - "owner" : "gn", - "name" : "m", - "access" : 1, - "descriptor" : "I" - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(I)V" - } ] -}, { - "class" : "HealthBarUpdate", - "name" : "bg", - "super" : "gw", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "cycle", - "owner" : "bg", - "name" : "m", - "access" : 0, - "descriptor" : "I", - "decoder" : 2103089795 - }, { - "field" : "cycleOffset", - "owner" : "bg", - "name" : "w", - "access" : 0, - "descriptor" : "I", - "decoder" : -1876302639 - }, { - "field" : "health", - "owner" : "bg", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : 1821995313 - }, { - "field" : "health2", - "owner" : "bg", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : -820353645 - } ], - "methods" : [ { - "method" : "set", - "owner" : "bg", - "name" : "m", - "access" : 0, - "descriptor" : "(IIIII)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(IIII)V" - } ] -}, { - "class" : "ItemContainer", - "name" : "bc", - "super" : "gw", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "ids", - "owner" : "bc", - "name" : "f", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "quantities", - "owner" : "bc", - "name" : "q", - "access" : 0, - "descriptor" : "[I" - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "WorldMapCacheName", - "name" : "aw", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "name", - "owner" : "aw", - "name" : "u", - "access" : 17, - "descriptor" : "Ljava/lang/String;" - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Ljava/lang/String;)V" - } ] -}, { - "class" : "AbstractSound", - "name" : "dd", - "super" : "gw", - "access" : 1057, - "interfaces" : [ ], - "fields" : [ { - "field" : "position", - "owner" : "dd", - "name" : "u", - "access" : 0, - "descriptor" : "I" - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "ByteArrayPool", - "name" : "gi", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ ], - "constructors" : [ ] -}, { - "class" : "AbstractSocket", - "name" : "fu", - "super" : "java.lang.Object", - "access" : 1057, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ { - "method" : "available", - "owner" : "fu", - "name" : "q", - "access" : 1025, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "close", - "owner" : "fu", - "name" : "g", - "access" : 1025, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "isAvailable", - "owner" : "fu", - "name" : "f", - "access" : 1025, - "parameters" : [ "length" ], - "descriptor" : "(II)Z" - }, { - "method" : "read", - "owner" : "fu", - "name" : "o", - "access" : 1025, - "parameters" : [ "dst", "dstIndex", "length" ], - "descriptor" : "([BIII)I" - }, { - "method" : "readUnsignedByte", - "owner" : "fu", - "name" : "w", - "access" : 1025, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "write", - "owner" : "fu", - "name" : "u", - "access" : 1025, - "parameters" : [ "src", "srcIndex", "length" ], - "descriptor" : "([BIIB)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "Skeleton", - "name" : "ek", - "super" : "gw", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "count", - "owner" : "ek", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : 1875841677 - }, { - "field" : "id", - "owner" : "ek", - "name" : "m", - "access" : 0, - "descriptor" : "I", - "decoder" : -1634889691 - }, { - "field" : "labels", - "owner" : "ek", - "name" : "w", - "access" : 0, - "descriptor" : "[[I" - }, { - "field" : "transformTypes", - "owner" : "ek", - "name" : "q", - "access" : 0, - "descriptor" : "[I" - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(I[B)V" - } ] -}, { - "class" : "TriBool", - "name" : "kd", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "StudioGame", - "name" : "is", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ "gc" ], - "fields" : [ { - "field" : "id", - "owner" : "is", - "name" : "l", - "access" : 16, - "descriptor" : "I", - "decoder" : -1688917715 - }, { - "field" : "name", - "owner" : "is", - "name" : "g", - "access" : 17, - "descriptor" : "Ljava/lang/String;" - } ], - "methods" : [ { - "method" : "ordinal", - "owner" : "is", - "name" : "f", - "access" : 1, - "descriptor" : "(B)I" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Ljava/lang/String;Ljava/lang/String;I)V" - } ] -}, { - "class" : "Varps", - "name" : "hv", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ ], - "constructors" : [ ] -}, { - "class" : "WorldMapSection", - "name" : "ab", - "super" : "java.lang.Object", - "access" : 1537, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ { - "method" : "containsCoord", - "owner" : "ab", - "name" : "f", - "access" : 1025, - "parameters" : [ "plane", "x", "y" ], - "descriptor" : "(IIIB)Z" - }, { - "method" : "containsPosition", - "owner" : "ab", - "name" : "q", - "access" : 1025, - "parameters" : [ "x", "y" ], - "descriptor" : "(IIB)Z" - }, { - "method" : "coord", - "owner" : "ab", - "name" : "o", - "access" : 1025, - "parameters" : [ "x", "y" ], - "descriptor" : "(III)Lhu;" - }, { - "method" : "expandBounds", - "owner" : "ab", - "name" : "m", - "access" : 1025, - "parameters" : [ "area" ], - "descriptor" : "(Lag;I)V" - }, { - "method" : "position", - "owner" : "ab", - "name" : "w", - "access" : 1025, - "parameters" : [ "plane", "x", "y" ], - "descriptor" : "(IIII)[I" - }, { - "method" : "read", - "owner" : "ab", - "name" : "u", - "access" : 1025, - "parameters" : [ "buffer" ], - "descriptor" : "(Lgr;B)V" - } ], - "constructors" : [ ] -}, { - "class" : "Buddy", - "name" : "ke", - "super" : "js", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "int2", - "owner" : "ke", - "name" : "u", - "access" : 1, - "descriptor" : "I", - "decoder" : 120689297 - }, { - "field" : "rank", - "owner" : "ke", - "name" : "g", - "access" : 1, - "descriptor" : "I", - "decoder" : -304954565 - }, { - "field" : "world0", - "owner" : "ke", - "name" : "o", - "access" : 1, - "descriptor" : "I", - "decoder" : 429472919 - } ], - "methods" : [ { - "method" : "hasWorld", - "owner" : "ke", - "name" : "au", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)Z" - }, { - "method" : "set", - "owner" : "ke", - "name" : "an", - "access" : 0, - "descriptor" : "(IIS)V" - }, { - "method" : "world", - "owner" : "ke", - "name" : "az", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)I" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "RunException", - "name" : "fx", - "super" : "java.lang.RuntimeException", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "string", - "owner" : "fx", - "name" : "o", - "access" : 0, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "throwable", - "owner" : "fx", - "name" : "u", - "access" : 0, - "descriptor" : "Ljava/lang/Throwable;" - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Ljava/lang/Throwable;Ljava/lang/String;)V" - } ] -}, { - "class" : "AbstractRasterProvider", - "name" : "lp", - "super" : "java.lang.Object", - "access" : 1057, - "interfaces" : [ ], - "fields" : [ { - "field" : "height", - "owner" : "lp", - "name" : "o", - "access" : 1, - "descriptor" : "I", - "decoder" : -239960145 - }, { - "field" : "pixels", - "owner" : "lp", - "name" : "q", - "access" : 1, - "descriptor" : "[I" - }, { - "field" : "width", - "owner" : "lp", - "name" : "w", - "access" : 1, - "descriptor" : "I", - "decoder" : -560298363 - } ], - "methods" : [ { - "method" : "apply", - "owner" : "lp", - "name" : "b", - "access" : 17, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "draw", - "owner" : "lp", - "name" : "q", - "access" : 1025, - "parameters" : [ "x", "y", "width", "height" ], - "descriptor" : "(IIIIB)V" - }, { - "method" : "drawFull", - "owner" : "lp", - "name" : "f", - "access" : 1025, - "parameters" : [ "x", "y" ], - "descriptor" : "(III)V" - } ], - "constructors" : [ { - "access" : 4, - "descriptor" : "()V" - } ] -}, { - "class" : "WorldMapEvent", - "name" : "ap", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "coord1", - "owner" : "ap", - "name" : "f", - "access" : 1, - "descriptor" : "Lhu;" - }, { - "field" : "coord2", - "owner" : "ap", - "name" : "q", - "access" : 1, - "descriptor" : "Lhu;" - }, { - "field" : "mapElement", - "owner" : "ap", - "name" : "m", - "access" : 1, - "descriptor" : "I", - "decoder" : 264384233 - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(ILhu;Lhu;)V" - } ] -}, { - "class" : "DualNode", - "name" : "fn", - "super" : "gw", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "keyDual", - "owner" : "fn", - "name" : "cg", - "access" : 1, - "descriptor" : "J" - }, { - "field" : "nextDual", - "owner" : "fn", - "name" : "cp", - "access" : 1, - "descriptor" : "Lfn;" - }, { - "field" : "previousDual", - "owner" : "fn", - "name" : "cf", - "access" : 1, - "descriptor" : "Lfn;" - } ], - "methods" : [ { - "method" : "removeDual", - "owner" : "fn", - "name" : "cg", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()V" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "()V" - } ] -}, { - "class" : "ClientPacketMarker", - "name" : "gb", - "super" : "java.lang.Object", - "access" : 1537, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ ], - "constructors" : [ ] -}, { - "class" : "ByteArrayNode", - "name" : "gp", - "super" : "gw", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "byteArray", - "owner" : "gp", - "name" : "m", - "access" : 1, - "descriptor" : "[B" - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 1, - "descriptor" : "([B)V" - } ] -}, { - "class" : "ClanMate", - "name" : "jk", - "super" : "ke", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "isFriend0", - "owner" : "jk", - "name" : "m", - "access" : 0, - "descriptor" : "Lkd;" - }, { - "field" : "isIgnored0", - "owner" : "jk", - "name" : "f", - "access" : 0, - "descriptor" : "Lkd;" - } ], - "methods" : [ { - "method" : "clearIsFriend", - "owner" : "jk", - "name" : "m", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "clearIsIgnored", - "owner" : "jk", - "name" : "w", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "fillIsFriend", - "owner" : "jk", - "name" : "q", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "fillIsIgnored", - "owner" : "jk", - "name" : "u", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "isFriend", - "owner" : "jk", - "name" : "f", - "access" : 17, - "parameters" : [ ], - "descriptor" : "(I)Z" - }, { - "method" : "isIgnored", - "owner" : "jk", - "name" : "o", - "access" : 17, - "parameters" : [ ], - "descriptor" : "(I)Z" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "Login", - "name" : "cu", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ ], - "constructors" : [ ] -}, { - "class" : "HealthBar", - "name" : "cr", - "super" : "gw", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "definition", - "owner" : "cr", - "name" : "q", - "access" : 0, - "descriptor" : "Lii;" - }, { - "field" : "updates", - "owner" : "cr", - "name" : "w", - "access" : 0, - "descriptor" : "Lja;" - } ], - "methods" : [ { - "method" : "get", - "owner" : "cr", - "name" : "f", - "access" : 0, - "parameters" : [ "cycle" ], - "descriptor" : "(II)Lbg;" - }, { - "method" : "isEmpty", - "owner" : "cr", - "name" : "q", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)Z" - }, { - "method" : "put", - "owner" : "cr", - "name" : "m", - "access" : 0, - "descriptor" : "(IIIIB)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Lii;)V" - } ] -}, { - "class" : "RasterProvider", - "name" : "ai", - "super" : "lp", - "access" : 49, - "interfaces" : [ ], - "fields" : [ { - "field" : "component0", - "owner" : "ai", - "name" : "m", - "access" : 0, - "descriptor" : "Ljava/awt/Component;" - }, { - "field" : "image", - "owner" : "ai", - "name" : "f", - "access" : 0, - "descriptor" : "Ljava/awt/Image;" - } ], - "methods" : [ { - "method" : "draw", - "owner" : "ai", - "name" : "q", - "access" : 17, - "parameters" : [ "x", "y", "width", "height" ], - "descriptor" : "(IIIIB)V" - }, { - "method" : "draw0", - "owner" : "ai", - "name" : "o", - "access" : 16, - "parameters" : [ "graphics", "x", "y", "width", "height" ], - "descriptor" : "(Ljava/awt/Graphics;IIIIB)V" - }, { - "method" : "drawFull", - "owner" : "ai", - "name" : "f", - "access" : 17, - "parameters" : [ "x", "y" ], - "descriptor" : "(III)V" - }, { - "method" : "drawFull0", - "owner" : "ai", - "name" : "w", - "access" : 16, - "parameters" : [ "graphics", "x", "y" ], - "descriptor" : "(Ljava/awt/Graphics;III)V" - }, { - "method" : "setComponent", - "owner" : "ai", - "name" : "m", - "access" : 16, - "descriptor" : "(Ljava/awt/Component;B)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(IILjava/awt/Component;)V" - } ] -}, { - "class" : "Enumerated", - "name" : "gc", - "super" : "java.lang.Object", - "access" : 1537, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ { - "method" : "ordinal", - "owner" : "gc", - "name" : "f", - "access" : 1025, - "parameters" : [ ], - "descriptor" : "(B)I" - } ], - "constructors" : [ ] -}, { - "class" : "Message", - "name" : "bm", - "super" : "fn", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "count", - "owner" : "bm", - "name" : "m", - "access" : 0, - "descriptor" : "I", - "decoder" : 1597147817 - }, { - "field" : "cycle", - "owner" : "bm", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : 1164592791 - }, { - "field" : "isFromFriend0", - "owner" : "bm", - "name" : "u", - "access" : 0, - "descriptor" : "Lkd;" - }, { - "field" : "isFromIgnored0", - "owner" : "bm", - "name" : "g", - "access" : 0, - "descriptor" : "Lkd;" - }, { - "field" : "prefix", - "owner" : "bm", - "name" : "l", - "access" : 0, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "sender", - "owner" : "bm", - "name" : "w", - "access" : 0, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "senderUsername", - "owner" : "bm", - "name" : "o", - "access" : 0, - "descriptor" : "Lkp;" - }, { - "field" : "text", - "owner" : "bm", - "name" : "e", - "access" : 0, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "type", - "owner" : "bm", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : 1223792995 - } ], - "methods" : [ { - "method" : "clearIsFromFriend", - "owner" : "bm", - "name" : "f", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "clearIsFromIgnored", - "owner" : "bm", - "name" : "o", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "fillIsFromFriend", - "owner" : "bm", - "name" : "w", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "fillIsFromIgnored", - "owner" : "bm", - "name" : "g", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(S)V" - }, { - "method" : "fillSenderUsername", - "owner" : "bm", - "name" : "l", - "access" : 16, - "parameters" : [ ], - "descriptor" : "(B)V" - }, { - "method" : "isFromFriend", - "owner" : "bm", - "name" : "q", - "access" : 16, - "parameters" : [ ], - "descriptor" : "(I)Z" - }, { - "method" : "isFromIgnored", - "owner" : "bm", - "name" : "u", - "access" : 16, - "parameters" : [ ], - "descriptor" : "(B)Z" - }, { - "method" : "set", - "owner" : "bm", - "name" : "m", - "access" : 0, - "parameters" : [ "type", "sender", "prefix", "text" ], - "descriptor" : "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" - } ] -}, { - "class" : "Rasterizer2D", - "name" : "lf", - "super" : "fn", - "access" : 33, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ ], - "constructors" : [ { - "access" : 4, - "descriptor" : "()V" - } ] -}, { - "class" : "NanoClock", - "name" : "fp", - "super" : "fa", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "lastTimeNano", - "owner" : "fp", - "name" : "m", - "access" : 0, - "descriptor" : "J", - "decoder" : 7586221391557635221 - } ], - "methods" : [ { - "method" : "mark", - "owner" : "fp", - "name" : "m", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)V" - }, { - "method" : "wait", - "owner" : "fp", - "name" : "f", - "access" : 1, - "parameters" : [ "cycleMs", "minSleepMs" ], - "descriptor" : "(III)I" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "()V" - } ] -}, { - "class" : "DirectByteArrayCopier", - "name" : "gv", - "super" : "gu", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "directBuffer", - "owner" : "gv", - "name" : "m", - "access" : 0, - "descriptor" : "Ljava/nio/ByteBuffer;" - } ], - "methods" : [ { - "method" : "get", - "owner" : "gv", - "name" : "m", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)[B" - }, { - "method" : "set", - "owner" : "gv", - "name" : "f", - "access" : 0, - "parameters" : [ "array" ], - "descriptor" : "([BI)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "MouseWheel", - "name" : "fv", - "super" : "java.lang.Object", - "access" : 1537, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ { - "method" : "useRotation", - "owner" : "fv", - "name" : "q", - "access" : 1025, - "parameters" : [ ], - "descriptor" : "(I)I" - } ], - "constructors" : [ ] -}, { - "class" : "ReflectionCheck", - "name" : "lw", - "super" : "gw", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "arguments", - "owner" : "lw", - "name" : "m", - "access" : 0, - "descriptor" : "[[[B" - }, { - "field" : "creationErrors", - "owner" : "lw", - "name" : "u", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "fields", - "owner" : "lw", - "name" : "g", - "access" : 0, - "descriptor" : "[Ljava/lang/reflect/Field;" - }, { - "field" : "id", - "owner" : "lw", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : -1955146989 - }, { - "field" : "intReplaceValues", - "owner" : "lw", - "name" : "f", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "methods", - "owner" : "lw", - "name" : "l", - "access" : 0, - "descriptor" : "[Ljava/lang/reflect/Method;" - }, { - "field" : "operations", - "owner" : "lw", - "name" : "o", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "size", - "owner" : "lw", - "name" : "w", - "access" : 0, - "descriptor" : "I", - "decoder" : -1091722075 - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "FriendLoginUpdate", - "name" : "kn", - "super" : "gh", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "time", - "owner" : "kn", - "name" : "q", - "access" : 1, - "descriptor" : "I", - "decoder" : -1390885889 - }, { - "field" : "username", - "owner" : "kn", - "name" : "w", - "access" : 1, - "descriptor" : "Lkp;" - }, { - "field" : "world", - "owner" : "kn", - "name" : "o", - "access" : 1, - "descriptor" : "S" - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Lkp;I)V" - } ] -}, { - "class" : "WidgetGroupParent", - "name" : "bx", - "super" : "gw", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "group", - "owner" : "bx", - "name" : "m", - "access" : 0, - "descriptor" : "I", - "decoder" : -707461797 - }, { - "field" : "keep", - "owner" : "bx", - "name" : "q", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "type", - "owner" : "bx", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : 1712037041 - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "WorldMapIndexCacheLoader", - "name" : "ls", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "cacheName", - "owner" : "ls", - "name" : "o", - "access" : 0, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "indexCache", - "owner" : "ls", - "name" : "u", - "access" : 0, - "descriptor" : "Lir;" - }, { - "field" : "isLoaded0", - "owner" : "ls", - "name" : "l", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "percentLoaded0", - "owner" : "ls", - "name" : "g", - "access" : 0, - "descriptor" : "I", - "decoder" : 624113115 - } ], - "methods" : [ { - "method" : "isLoaded", - "owner" : "ls", - "name" : "q", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(S)Z" - }, { - "method" : "load", - "owner" : "ls", - "name" : "f", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "percentLoaded", - "owner" : "ls", - "name" : "w", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "reset", - "owner" : "ls", - "name" : "m", - "access" : 0, - "parameters" : [ "cacheName" ], - "descriptor" : "(Ljava/lang/String;I)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Lir;)V" - } ] -}, { - "class" : "NetCache", - "name" : "iq", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ ], - "constructors" : [ ] -}, { - "class" : "EnumDefinition", - "name" : "jw", - "super" : "fn", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "defaultInt", - "owner" : "jw", - "name" : "u", - "access" : 1, - "descriptor" : "I", - "decoder" : 1948115527 - }, { - "field" : "defaultString", - "owner" : "jw", - "name" : "o", - "access" : 1, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "intVals", - "owner" : "jw", - "name" : "e", - "access" : 1, - "descriptor" : "[I" - }, { - "field" : "keyType", - "owner" : "jw", - "name" : "q", - "access" : 1, - "descriptor" : "C" - }, { - "field" : "keys", - "owner" : "jw", - "name" : "l", - "access" : 1, - "descriptor" : "[I" - }, { - "field" : "size0", - "owner" : "jw", - "name" : "g", - "access" : 1, - "descriptor" : "I", - "decoder" : -12324053 - }, { - "field" : "stringVals", - "owner" : "jw", - "name" : "x", - "access" : 1, - "descriptor" : "[Ljava/lang/String;" - }, { - "field" : "valType", - "owner" : "jw", - "name" : "w", - "access" : 1, - "descriptor" : "C" - } ], - "methods" : [ { - "method" : "read", - "owner" : "jw", - "name" : "f", - "access" : 0, - "descriptor" : "(Lgr;I)V" - }, { - "method" : "readNext", - "owner" : "jw", - "name" : "q", - "access" : 0, - "descriptor" : "(Lgr;II)V" - }, { - "method" : "size", - "owner" : "jw", - "name" : "w", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)I" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "DemotingHashTable", - "name" : "ec", - "super" : "java.lang.Object", - "access" : 49, - "interfaces" : [ ], - "fields" : [ { - "field" : "capacity", - "owner" : "ec", - "name" : "m", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "hashTable", - "owner" : "ec", - "name" : "q", - "access" : 0, - "descriptor" : "Llh;" - }, { - "field" : "queue", - "owner" : "ec", - "name" : "w", - "access" : 0, - "descriptor" : "Ljc;" - }, { - "field" : "remaining", - "owner" : "ec", - "name" : "f", - "access" : 0, - "descriptor" : "I" - } ], - "methods" : [ { - "method" : "clear", - "owner" : "ec", - "name" : "u", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "demote", - "owner" : "ec", - "name" : "o", - "access" : 1, - "parameters" : [ "softeningLevel" ], - "descriptor" : "(I)V" - }, { - "method" : "get", - "owner" : "ec", - "name" : "m", - "access" : 1, - "parameters" : [ "key" ], - "descriptor" : "(J)Ljava/lang/Object;" - }, { - "method" : "put", - "owner" : "ec", - "name" : "w", - "access" : 1, - "parameters" : [ "value", "key", "size" ], - "descriptor" : "(Ljava/lang/Object;JI)V" - }, { - "method" : "remove", - "owner" : "ec", - "name" : "f", - "access" : 0, - "parameters" : [ "key" ], - "descriptor" : "(J)V" - }, { - "method" : "removeWrapper", - "owner" : "ec", - "name" : "q", - "access" : 0, - "parameters" : [ "wrapper" ], - "descriptor" : "(Leu;)V" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(II)V" - } ] -}, { - "class" : "Wrapper", - "name" : "eu", - "super" : "fn", - "access" : 1057, - "interfaces" : [ ], - "fields" : [ { - "field" : "size", - "owner" : "eu", - "name" : "f", - "access" : 16, - "descriptor" : "I" - } ], - "methods" : [ { - "method" : "get", - "owner" : "eu", - "name" : "m", - "access" : 1024, - "parameters" : [ ], - "descriptor" : "()Ljava/lang/Object;" - }, { - "method" : "isSoft", - "owner" : "eu", - "name" : "f", - "access" : 1024, - "parameters" : [ ], - "descriptor" : "()Z" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(I)V" - } ] }, { "class" : "UserList", "name" : "km", @@ -2776,6 +1737,211 @@ "access" : 0, "descriptor" : "(I)V" } ] +}, { + "class" : "Skeleton", + "name" : "ek", + "super" : "gw", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "count", + "owner" : "ek", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : 1875841677 + }, { + "field" : "id", + "owner" : "ek", + "name" : "m", + "access" : 0, + "descriptor" : "I", + "decoder" : -1634889691 + }, { + "field" : "labels", + "owner" : "ek", + "name" : "w", + "access" : 0, + "descriptor" : "[[I" + }, { + "field" : "transformTypes", + "owner" : "ek", + "name" : "q", + "access" : 0, + "descriptor" : "[I" + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(I[B)V" + } ] +}, { + "class" : "IntegerNode", + "name" : "gn", + "super" : "gw", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "integer", + "owner" : "gn", + "name" : "m", + "access" : 1, + "descriptor" : "I" + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(I)V" + } ] +}, { + "class" : "ObjectNode", + "name" : "fk", + "super" : "gw", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "obj", + "owner" : "fk", + "name" : "m", + "access" : 17, + "descriptor" : "Ljava/lang/Object;" + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(Ljava/lang/Object;)V" + } ] +}, { + "class" : "DualNode", + "name" : "fn", + "super" : "gw", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "keyDual", + "owner" : "fn", + "name" : "cg", + "access" : 1, + "descriptor" : "J" + }, { + "field" : "nextDual", + "owner" : "fn", + "name" : "cp", + "access" : 1, + "descriptor" : "Lfn;" + }, { + "field" : "previousDual", + "owner" : "fn", + "name" : "cf", + "access" : 1, + "descriptor" : "Lfn;" + } ], + "methods" : [ { + "method" : "removeDual", + "owner" : "fn", + "name" : "cg", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()V" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "()V" + } ] +}, { + "class" : "InterfaceParent", + "name" : "bx", + "super" : "gw", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "itf", + "owner" : "bx", + "name" : "m", + "access" : 0, + "descriptor" : "I", + "decoder" : -707461797 + }, { + "field" : "keep", + "owner" : "bx", + "name" : "q", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "type", + "owner" : "bx", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : 1712037041 + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "ParamDefinition", + "name" : "jb", + "super" : "fn", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "autodisable", + "owner" : "jb", + "name" : "u", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "defaultint", + "owner" : "jb", + "name" : "w", + "access" : 1, + "descriptor" : "I", + "decoder" : 1133042753 + }, { + "field" : "defaultstr", + "owner" : "jb", + "name" : "o", + "access" : 1, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "type", + "owner" : "jb", + "name" : "q", + "access" : 0, + "descriptor" : "C" + } ], + "methods" : [ { + "method" : "decode", + "owner" : "jb", + "name" : "q", + "access" : 0, + "descriptor" : "(Lgr;I)V" + }, { + "method" : "decode0", + "owner" : "jb", + "name" : "w", + "access" : 0, + "descriptor" : "(Lgr;II)V" + }, { + "method" : "isString", + "owner" : "jb", + "name" : "o", + "access" : 1, + "descriptor" : "(I)Z" + }, { + "method" : "postDecode", + "owner" : "jb", + "name" : "f", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(B)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] }, { "class" : "Animation", "name" : "dz", @@ -2831,67 +1997,36 @@ "descriptor" : "([BLek;)V" } ] }, { - "class" : "ParamKeyDefinition", - "name" : "jb", - "super" : "fn", - "access" : 33, + "class" : "PcmPlayerProvider", + "name" : "cz", + "super" : "java.lang.Object", + "access" : 1537, "interfaces" : [ ], - "fields" : [ { - "field" : "isMembersOnly", - "owner" : "jb", - "name" : "u", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "keyInt", - "owner" : "jb", - "name" : "w", - "access" : 1, - "descriptor" : "I", - "decoder" : 1133042753 - }, { - "field" : "keyString", - "owner" : "jb", - "name" : "o", - "access" : 1, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "type", - "owner" : "jb", - "name" : "q", - "access" : 0, - "descriptor" : "C" - } ], + "fields" : [ ], "methods" : [ { - "method" : "init", - "owner" : "jb", - "name" : "f", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(B)V" - }, { - "method" : "isString", - "owner" : "jb", - "name" : "o", - "access" : 1, - "descriptor" : "(I)Z" - }, { - "method" : "read", - "owner" : "jb", - "name" : "q", - "access" : 0, - "descriptor" : "(Lgr;I)V" - }, { - "method" : "readNext", - "owner" : "jb", - "name" : "w", - "access" : 0, - "descriptor" : "(Lgr;II)V" + "method" : "player", + "owner" : "cz", + "name" : "m", + "access" : 1025, + "descriptor" : "(B)Lco;" } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] + "constructors" : [ ] +}, { + "class" : "Enumerated", + "name" : "gc", + "super" : "java.lang.Object", + "access" : 1537, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ { + "method" : "ordinal", + "owner" : "gc", + "name" : "f", + "access" : 1025, + "parameters" : [ ], + "descriptor" : "(B)I" + } ], + "constructors" : [ ] }, { "class" : "NetFileRequest", "name" : "iz", @@ -2899,18 +2034,18 @@ "access" : 33, "interfaces" : [ ], "fields" : [ { + "field" : "archive", + "owner" : "iz", + "name" : "m", + "access" : 1, + "descriptor" : "Lit;" + }, { "field" : "crc", "owner" : "iz", "name" : "f", "access" : 1, "descriptor" : "I", "decoder" : 1487103265 - }, { - "field" : "indexCache", - "owner" : "iz", - "name" : "m", - "access" : 1, - "descriptor" : "Lit;" }, { "field" : "padding", "owner" : "iz", @@ -2923,6 +2058,278 @@ "access" : 0, "descriptor" : "()V" } ] +}, { + "class" : "Buddy", + "name" : "ke", + "super" : "js", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "int2", + "owner" : "ke", + "name" : "u", + "access" : 1, + "descriptor" : "I", + "decoder" : 120689297 + }, { + "field" : "rank", + "owner" : "ke", + "name" : "g", + "access" : 1, + "descriptor" : "I", + "decoder" : -304954565 + }, { + "field" : "world0", + "owner" : "ke", + "name" : "o", + "access" : 1, + "descriptor" : "I", + "decoder" : 429472919 + } ], + "methods" : [ { + "method" : "hasWorld", + "owner" : "ke", + "name" : "au", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)Z" + }, { + "method" : "set", + "owner" : "ke", + "name" : "an", + "access" : 0, + "descriptor" : "(IIS)V" + }, { + "method" : "world", + "owner" : "ke", + "name" : "az", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)I" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "HealthBarUpdate", + "name" : "bg", + "super" : "gw", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "cycle", + "owner" : "bg", + "name" : "m", + "access" : 0, + "descriptor" : "I", + "decoder" : 2103089795 + }, { + "field" : "cycleOffset", + "owner" : "bg", + "name" : "w", + "access" : 0, + "descriptor" : "I", + "decoder" : -1876302639 + }, { + "field" : "health", + "owner" : "bg", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : 1821995313 + }, { + "field" : "health2", + "owner" : "bg", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : -820353645 + } ], + "methods" : [ { + "method" : "set", + "owner" : "bg", + "name" : "m", + "access" : 0, + "descriptor" : "(IIIII)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(IIII)V" + } ] +}, { + "class" : "HealthBar", + "name" : "cr", + "super" : "gw", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "definition", + "owner" : "cr", + "name" : "q", + "access" : 0, + "descriptor" : "Lii;" + }, { + "field" : "updates", + "owner" : "cr", + "name" : "w", + "access" : 0, + "descriptor" : "Lja;" + } ], + "methods" : [ { + "method" : "get", + "owner" : "cr", + "name" : "f", + "access" : 0, + "parameters" : [ "cycle" ], + "descriptor" : "(II)Lbg;" + }, { + "method" : "isEmpty", + "owner" : "cr", + "name" : "q", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)Z" + }, { + "method" : "put", + "owner" : "cr", + "name" : "m", + "access" : 0, + "descriptor" : "(IIIIB)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Lii;)V" + } ] +}, { + "class" : "IntHashTable", + "name" : "lv", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "array", + "owner" : "lv", + "name" : "m", + "access" : 0, + "descriptor" : "[I" + } ], + "methods" : [ { + "method" : "get", + "owner" : "lv", + "name" : "m", + "access" : 1, + "descriptor" : "(II)I" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "([I)V" + } ] +}, { + "class" : "FloorUnderlayDefinition", + "name" : "ih", + "super" : "fn", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "hue", + "owner" : "ih", + "name" : "w", + "access" : 1, + "descriptor" : "I", + "decoder" : -1465372343 + }, { + "field" : "hueMultiplier", + "owner" : "ih", + "name" : "g", + "access" : 1, + "descriptor" : "I", + "decoder" : 1484542081 + }, { + "field" : "lightness", + "owner" : "ih", + "name" : "u", + "access" : 1, + "descriptor" : "I", + "decoder" : -1691813081 + }, { + "field" : "rgb", + "owner" : "ih", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : -635678213 + }, { + "field" : "saturation", + "owner" : "ih", + "name" : "o", + "access" : 1, + "descriptor" : "I", + "decoder" : 2031118785 + } ], + "methods" : [ { + "method" : "decode", + "owner" : "ih", + "name" : "w", + "access" : 0, + "descriptor" : "(Lgr;II)V" + }, { + "method" : "decode0", + "owner" : "ih", + "name" : "o", + "access" : 0, + "descriptor" : "(Lgr;III)V" + }, { + "method" : "postDecode", + "owner" : "ih", + "name" : "q", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "setHsl", + "owner" : "ih", + "name" : "u", + "access" : 0, + "parameters" : [ "rgb" ], + "descriptor" : "(IB)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "Wrapper", + "name" : "eu", + "super" : "fn", + "access" : 1057, + "interfaces" : [ ], + "fields" : [ { + "field" : "size", + "owner" : "eu", + "name" : "f", + "access" : 16, + "descriptor" : "I" + } ], + "methods" : [ { + "method" : "get", + "owner" : "eu", + "name" : "m", + "access" : 1024, + "parameters" : [ ], + "descriptor" : "()Ljava/lang/Object;" + }, { + "method" : "isSoft", + "owner" : "eu", + "name" : "f", + "access" : 1024, + "parameters" : [ ], + "descriptor" : "()Z" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(I)V" + } ] }, { "class" : "DualNodeDeque", "name" : "jp", @@ -2971,6 +2378,275 @@ "access" : 1, "descriptor" : "()V" } ] +}, { + "class" : "NodeHashTable", + "name" : "ld", + "super" : "java.lang.Object", + "access" : 49, + "interfaces" : [ ], + "fields" : [ { + "field" : "buckets", + "owner" : "ld", + "name" : "f", + "access" : 0, + "descriptor" : "[Lgw;" + }, { + "field" : "current", + "owner" : "ld", + "name" : "w", + "access" : 0, + "descriptor" : "Lgw;" + }, { + "field" : "currentGet", + "owner" : "ld", + "name" : "q", + "access" : 0, + "descriptor" : "Lgw;" + }, { + "field" : "index", + "owner" : "ld", + "name" : "o", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "size", + "owner" : "ld", + "name" : "m", + "access" : 0, + "descriptor" : "I" + } ], + "methods" : [ { + "method" : "clear", + "owner" : "ld", + "name" : "q", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "first", + "owner" : "ld", + "name" : "w", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()Lgw;" + }, { + "method" : "get", + "owner" : "ld", + "name" : "m", + "access" : 1, + "parameters" : [ "key" ], + "descriptor" : "(J)Lgw;" + }, { + "method" : "next", + "owner" : "ld", + "name" : "o", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()Lgw;" + }, { + "method" : "put", + "owner" : "ld", + "name" : "f", + "access" : 1, + "parameters" : [ "node", "key" ], + "descriptor" : "(Lgw;J)V" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(I)V" + } ] +}, { + "class" : "ReflectionCheck", + "name" : "lw", + "super" : "gw", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "arguments", + "owner" : "lw", + "name" : "m", + "access" : 0, + "descriptor" : "[[[B" + }, { + "field" : "creationErrors", + "owner" : "lw", + "name" : "u", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "fields", + "owner" : "lw", + "name" : "g", + "access" : 0, + "descriptor" : "[Ljava/lang/reflect/Field;" + }, { + "field" : "id", + "owner" : "lw", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : -1955146989 + }, { + "field" : "intReplaceValues", + "owner" : "lw", + "name" : "f", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "methods", + "owner" : "lw", + "name" : "l", + "access" : 0, + "descriptor" : "[Ljava/lang/reflect/Method;" + }, { + "field" : "operations", + "owner" : "lw", + "name" : "o", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "size", + "owner" : "lw", + "name" : "w", + "access" : 0, + "descriptor" : "I", + "decoder" : -1091722075 + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "AbstractSocket", + "name" : "fu", + "super" : "java.lang.Object", + "access" : 1057, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ { + "method" : "available", + "owner" : "fu", + "name" : "q", + "access" : 1025, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "close", + "owner" : "fu", + "name" : "g", + "access" : 1025, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "isAvailable", + "owner" : "fu", + "name" : "f", + "access" : 1025, + "parameters" : [ "length" ], + "descriptor" : "(II)Z" + }, { + "method" : "read", + "owner" : "fu", + "name" : "o", + "access" : 1025, + "parameters" : [ "dst", "dstIndex", "length" ], + "descriptor" : "([BIII)I" + }, { + "method" : "readUnsignedByte", + "owner" : "fu", + "name" : "w", + "access" : 1025, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "write", + "owner" : "fu", + "name" : "u", + "access" : 1025, + "parameters" : [ "src", "srcIndex", "length" ], + "descriptor" : "([BIIB)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "VarbitDefinition", + "name" : "ia", + "super" : "fn", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "baseVar", + "owner" : "ia", + "name" : "q", + "access" : 1, + "descriptor" : "I", + "decoder" : 1552575189 + }, { + "field" : "endBit", + "owner" : "ia", + "name" : "o", + "access" : 1, + "descriptor" : "I", + "decoder" : -1710935305 + }, { + "field" : "startBit", + "owner" : "ia", + "name" : "w", + "access" : 1, + "descriptor" : "I", + "decoder" : -870948181 + } ], + "methods" : [ { + "method" : "decode", + "owner" : "ia", + "name" : "q", + "access" : 0, + "descriptor" : "(Lgr;I)V" + }, { + "method" : "decode0", + "owner" : "ia", + "name" : "w", + "access" : 0, + "descriptor" : "(Lgr;IB)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "InvDefinition", + "name" : "ib", + "super" : "fn", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "size", + "owner" : "ib", + "name" : "q", + "access" : 1, + "descriptor" : "I", + "decoder" : 1358868971 + } ], + "methods" : [ { + "method" : "decode", + "owner" : "ib", + "name" : "f", + "access" : 0, + "descriptor" : "(Lgr;I)V" + }, { + "method" : "decode0", + "owner" : "ib", + "name" : "q", + "access" : 0, + "descriptor" : "(Lgr;II)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] }, { "class" : "LoginPacket", "name" : "gl", @@ -2990,6 +2666,113 @@ "access" : 0, "descriptor" : "(II)V" } ] +}, { + "class" : "WorldMapEvent", + "name" : "ap", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "coord1", + "owner" : "ap", + "name" : "f", + "access" : 1, + "descriptor" : "Lhu;" + }, { + "field" : "coord2", + "owner" : "ap", + "name" : "q", + "access" : 1, + "descriptor" : "Lhu;" + }, { + "field" : "mapElement", + "owner" : "ap", + "name" : "m", + "access" : 1, + "descriptor" : "I", + "decoder" : 264384233 + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(ILhu;Lhu;)V" + } ] +}, { + "class" : "WorldMapSection", + "name" : "ab", + "super" : "java.lang.Object", + "access" : 1537, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ { + "method" : "containsCoord", + "owner" : "ab", + "name" : "f", + "access" : 1025, + "parameters" : [ "plane", "x", "y" ], + "descriptor" : "(IIIB)Z" + }, { + "method" : "containsPosition", + "owner" : "ab", + "name" : "q", + "access" : 1025, + "parameters" : [ "x", "y" ], + "descriptor" : "(IIB)Z" + }, { + "method" : "coord", + "owner" : "ab", + "name" : "o", + "access" : 1025, + "parameters" : [ "x", "y" ], + "descriptor" : "(III)Lhu;" + }, { + "method" : "expandBounds", + "owner" : "ab", + "name" : "m", + "access" : 1025, + "parameters" : [ "area" ], + "descriptor" : "(Lag;I)V" + }, { + "method" : "position", + "owner" : "ab", + "name" : "w", + "access" : 1025, + "parameters" : [ "plane", "x", "y" ], + "descriptor" : "(IIII)[I" + }, { + "method" : "read", + "owner" : "ab", + "name" : "u", + "access" : 1025, + "parameters" : [ "buffer" ], + "descriptor" : "(Lgr;B)V" + } ], + "constructors" : [ ] +}, { + "class" : "Frames", + "name" : "en", + "super" : "fn", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "frames", + "owner" : "en", + "name" : "m", + "access" : 0, + "descriptor" : "[Ldz;" + } ], + "methods" : [ { + "method" : "hasAlphaTransform", + "owner" : "en", + "name" : "m", + "access" : 1, + "parameters" : [ "frame" ], + "descriptor" : "(II)Z" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(Lir;Lir;IZ)V" + } ] }, { "class" : "Skills", "name" : "hc", @@ -2999,6 +2782,592 @@ "fields" : [ ], "methods" : [ ], "constructors" : [ ] +}, { + "class" : "SoftWrapper", + "name" : "ef", + "super" : "eu", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "ref", + "owner" : "ef", + "name" : "m", + "access" : 0, + "descriptor" : "Ljava/lang/ref/SoftReference;" + } ], + "methods" : [ { + "method" : "get", + "owner" : "ef", + "name" : "m", + "access" : 0, + "parameters" : [ ], + "descriptor" : "()Ljava/lang/Object;" + }, { + "method" : "isSoft", + "owner" : "ef", + "name" : "f", + "access" : 0, + "parameters" : [ ], + "descriptor" : "()Z" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Ljava/lang/Object;I)V" + } ] +}, { + "class" : "DirectWrapper", + "name" : "ew", + "super" : "eu", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "obj", + "owner" : "ew", + "name" : "m", + "access" : 0, + "descriptor" : "Ljava/lang/Object;" + } ], + "methods" : [ { + "method" : "get", + "owner" : "ew", + "name" : "m", + "access" : 0, + "parameters" : [ ], + "descriptor" : "()Ljava/lang/Object;" + }, { + "method" : "isSoft", + "owner" : "ew", + "name" : "f", + "access" : 0, + "parameters" : [ ], + "descriptor" : "()Z" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Ljava/lang/Object;I)V" + } ] +}, { + "class" : "SoundCache", + "name" : "dt", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "musicSampleIndex", + "owner" : "dt", + "name" : "f", + "access" : 0, + "descriptor" : "Lir;" + }, { + "field" : "musicSamples", + "owner" : "dt", + "name" : "q", + "access" : 0, + "descriptor" : "Lld;" + }, { + "field" : "rawSounds", + "owner" : "dt", + "name" : "w", + "access" : 0, + "descriptor" : "Lld;" + }, { + "field" : "soundEffectIndex", + "owner" : "dt", + "name" : "m", + "access" : 0, + "descriptor" : "Lir;" + } ], + "methods" : [ { + "method" : "getMusicSample", + "owner" : "dt", + "name" : "w", + "access" : 1, + "descriptor" : "(I[II)Lcx;" + }, { + "method" : "getMusicSample0", + "owner" : "dt", + "name" : "f", + "access" : 0, + "descriptor" : "(II[II)Lcx;" + }, { + "method" : "getSoundEffect", + "owner" : "dt", + "name" : "q", + "access" : 1, + "descriptor" : "(I[IB)Lcx;" + }, { + "method" : "getSoundEffect0", + "owner" : "dt", + "name" : "m", + "access" : 0, + "descriptor" : "(II[IS)Lcx;" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(Lir;Lir;)V" + } ] +}, { + "class" : "SpriteMask", + "name" : "hp", + "super" : "fn", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "height", + "owner" : "hp", + "name" : "f", + "access" : 17, + "descriptor" : "I", + "decoder" : -193097093 + }, { + "field" : "width", + "owner" : "hp", + "name" : "m", + "access" : 17, + "descriptor" : "I", + "decoder" : 574541221 + }, { + "field" : "xStarts", + "owner" : "hp", + "name" : "w", + "access" : 17, + "descriptor" : "[I" + }, { + "field" : "xWidths", + "owner" : "hp", + "name" : "q", + "access" : 17, + "descriptor" : "[I" + } ], + "methods" : [ { + "method" : "contains", + "owner" : "hp", + "name" : "m", + "access" : 1, + "parameters" : [ "x", "y" ], + "descriptor" : "(III)Z" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(II[I[II)V" + } ] +}, { + "class" : "StructDefinition", + "name" : "jq", + "super" : "fn", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "params", + "owner" : "jq", + "name" : "q", + "access" : 0, + "descriptor" : "Llh;" + } ], + "methods" : [ { + "method" : "decode", + "owner" : "jq", + "name" : "q", + "access" : 0, + "descriptor" : "(Lgr;I)V" + }, { + "method" : "decode0", + "owner" : "jq", + "name" : "w", + "access" : 0, + "descriptor" : "(Lgr;II)V" + }, { + "method" : "getIntParam", + "owner" : "jq", + "name" : "o", + "access" : 1, + "descriptor" : "(IIB)I" + }, { + "method" : "getStringParam", + "owner" : "jq", + "name" : "u", + "access" : 1, + "descriptor" : "(ILjava/lang/String;I)Ljava/lang/String;" + }, { + "method" : "postDecode", + "owner" : "jq", + "name" : "f", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(B)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "Rasterizer2D", + "name" : "lf", + "super" : "fn", + "access" : 33, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ ], + "constructors" : [ { + "access" : 4, + "descriptor" : "()V" + } ] +}, { + "class" : "Bzip2Decompressor", + "name" : "gk", + "super" : "java.lang.Object", + "access" : 49, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ ], + "constructors" : [ ] +}, { + "class" : "Interpreter", + "name" : "bv", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ ], + "constructors" : [ ] +}, { + "class" : "IgnoreList", + "name" : "kj", + "super" : "km", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "loginType", + "owner" : "kj", + "name" : "q", + "access" : 16, + "descriptor" : "Llx;" + } ], + "methods" : [ { + "method" : "newInstance", + "owner" : "kj", + "name" : "m", + "access" : 0, + "descriptor" : "(I)Ljs;" + }, { + "method" : "newTypedArray", + "owner" : "kj", + "name" : "f", + "access" : 0, + "descriptor" : "(II)[Ljs;" + }, { + "method" : "read", + "owner" : "kj", + "name" : "q", + "access" : 1, + "parameters" : [ "buffer", "n" ], + "descriptor" : "(Lgr;IB)V" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(Llx;)V" + } ] +}, { + "class" : "Message", + "name" : "bm", + "super" : "fn", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "count", + "owner" : "bm", + "name" : "m", + "access" : 0, + "descriptor" : "I", + "decoder" : 1597147817 + }, { + "field" : "cycle", + "owner" : "bm", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : 1164592791 + }, { + "field" : "isFromFriend0", + "owner" : "bm", + "name" : "u", + "access" : 0, + "descriptor" : "Lkd;" + }, { + "field" : "isFromIgnored0", + "owner" : "bm", + "name" : "g", + "access" : 0, + "descriptor" : "Lkd;" + }, { + "field" : "prefix", + "owner" : "bm", + "name" : "l", + "access" : 0, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "sender", + "owner" : "bm", + "name" : "w", + "access" : 0, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "senderUsername", + "owner" : "bm", + "name" : "o", + "access" : 0, + "descriptor" : "Lkp;" + }, { + "field" : "text", + "owner" : "bm", + "name" : "e", + "access" : 0, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "type", + "owner" : "bm", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : 1223792995 + } ], + "methods" : [ { + "method" : "clearIsFromFriend", + "owner" : "bm", + "name" : "f", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "clearIsFromIgnored", + "owner" : "bm", + "name" : "o", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "fillIsFromFriend", + "owner" : "bm", + "name" : "w", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "fillIsFromIgnored", + "owner" : "bm", + "name" : "g", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(S)V" + }, { + "method" : "fillSenderUsername", + "owner" : "bm", + "name" : "l", + "access" : 16, + "parameters" : [ ], + "descriptor" : "(B)V" + }, { + "method" : "isFromFriend", + "owner" : "bm", + "name" : "q", + "access" : 16, + "parameters" : [ ], + "descriptor" : "(I)Z" + }, { + "method" : "isFromIgnored", + "owner" : "bm", + "name" : "u", + "access" : 16, + "parameters" : [ ], + "descriptor" : "(B)Z" + }, { + "method" : "set", + "owner" : "bm", + "name" : "m", + "access" : 0, + "parameters" : [ "type", "sender", "prefix", "text" ], + "descriptor" : "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" + } ] +}, { + "class" : "Entity", + "name" : "ex", + "super" : "fn", + "access" : 1057, + "interfaces" : [ ], + "fields" : [ { + "field" : "height", + "owner" : "ex", + "name" : "cw", + "access" : 1, + "descriptor" : "I", + "decoder" : 849583845 + } ], + "methods" : [ { + "method" : "draw", + "owner" : "ex", + "name" : "cy", + "access" : 0, + "parameters" : [ "yaw", "cameraPitchSine", "cameraPitchCosine", "cameraYawSine", "cameraYawCosine", "x", "y", "z", "tag" ], + "descriptor" : "(IIIIIIIIJ)V" + }, { + "method" : "getModel", + "owner" : "ex", + "name" : "e", + "access" : 4, + "parameters" : [ ], + "descriptor" : "(I)Ldu;" + } ], + "constructors" : [ { + "access" : 4, + "descriptor" : "()V" + } ] +}, { + "class" : "NetCache", + "name" : "iq", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ ], + "constructors" : [ ] +}, { + "class" : "EnumDefinition", + "name" : "jw", + "super" : "fn", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "defaultint", + "owner" : "jw", + "name" : "u", + "access" : 1, + "descriptor" : "I", + "decoder" : 1948115527 + }, { + "field" : "defaultstr", + "owner" : "jw", + "name" : "o", + "access" : 1, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "inputtype", + "owner" : "jw", + "name" : "q", + "access" : 1, + "descriptor" : "C" + }, { + "field" : "intvals", + "owner" : "jw", + "name" : "e", + "access" : 1, + "descriptor" : "[I" + }, { + "field" : "keys", + "owner" : "jw", + "name" : "l", + "access" : 1, + "descriptor" : "[I" + }, { + "field" : "outputcount", + "owner" : "jw", + "name" : "g", + "access" : 1, + "descriptor" : "I", + "decoder" : -12324053 + }, { + "field" : "outputtype", + "owner" : "jw", + "name" : "w", + "access" : 1, + "descriptor" : "C" + }, { + "field" : "strvals", + "owner" : "jw", + "name" : "x", + "access" : 1, + "descriptor" : "[Ljava/lang/String;" + } ], + "methods" : [ { + "method" : "decode", + "owner" : "jw", + "name" : "f", + "access" : 0, + "descriptor" : "(Lgr;I)V" + }, { + "method" : "decode0", + "owner" : "jw", + "name" : "q", + "access" : 0, + "descriptor" : "(Lgr;II)V" + }, { + "method" : "size", + "owner" : "jw", + "name" : "w", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)I" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "Login", + "name" : "cu", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ ], + "constructors" : [ ] +}, { + "class" : "AttackOption", + "name" : "cj", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ "gc" ], + "fields" : [ { + "field" : "id", + "owner" : "cj", + "name" : "o", + "access" : 16, + "descriptor" : "I", + "decoder" : -1461217963 + } ], + "methods" : [ { + "method" : "ordinal", + "owner" : "cj", + "name" : "f", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)I" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(I)V" + } ] +}, { + "class" : "Messages", + "name" : "cw", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ ], + "constructors" : [ ] +}, { + "class" : "Rasterizer3D", + "name" : "et", + "super" : "lf", + "access" : 33, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ ], + "constructors" : [ ] }, { "class" : "AbstractFont", "name" : "kt", @@ -3229,168 +3598,44 @@ "descriptor" : "([B)V" } ] }, { - "class" : "UnderlayDefinition", - "name" : "ih", - "super" : "fn", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "hue", - "owner" : "ih", - "name" : "w", - "access" : 1, - "descriptor" : "I", - "decoder" : -1465372343 - }, { - "field" : "hueMultiplier", - "owner" : "ih", - "name" : "g", - "access" : 1, - "descriptor" : "I", - "decoder" : 1484542081 - }, { - "field" : "lightness", - "owner" : "ih", - "name" : "u", - "access" : 1, - "descriptor" : "I", - "decoder" : -1691813081 - }, { - "field" : "rgb", - "owner" : "ih", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : -635678213 - }, { - "field" : "saturation", - "owner" : "ih", - "name" : "o", - "access" : 1, - "descriptor" : "I", - "decoder" : 2031118785 - } ], - "methods" : [ { - "method" : "init", - "owner" : "ih", - "name" : "q", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "read", - "owner" : "ih", - "name" : "w", - "access" : 0, - "descriptor" : "(Lgr;II)V" - }, { - "method" : "readNext", - "owner" : "ih", - "name" : "o", - "access" : 0, - "descriptor" : "(Lgr;III)V" - }, { - "method" : "setHsl", - "owner" : "ih", - "name" : "u", - "access" : 0, - "parameters" : [ "rgb" ], - "descriptor" : "(IB)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "IntHashTable", - "name" : "lv", + "class" : "DevicePcmPlayerProvider", + "name" : "az", "super" : "java.lang.Object", "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "array", - "owner" : "lv", - "name" : "m", - "access" : 0, - "descriptor" : "[I" - } ], + "interfaces" : [ "cz" ], + "fields" : [ ], "methods" : [ { - "method" : "get", - "owner" : "lv", + "method" : "player", + "owner" : "az", "name" : "m", "access" : 1, - "descriptor" : "(II)I" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "([I)V" - } ] -}, { - "class" : "VarbitDefinition", - "name" : "ia", - "super" : "fn", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "highBit", - "owner" : "ia", - "name" : "o", - "access" : 1, - "descriptor" : "I", - "decoder" : -1710935305 - }, { - "field" : "lowBit", - "owner" : "ia", - "name" : "w", - "access" : 1, - "descriptor" : "I", - "decoder" : -870948181 - }, { - "field" : "varp", - "owner" : "ia", - "name" : "q", - "access" : 1, - "descriptor" : "I", - "decoder" : 1552575189 - } ], - "methods" : [ { - "method" : "read", - "owner" : "ia", - "name" : "q", - "access" : 0, - "descriptor" : "(Lgr;I)V" - }, { - "method" : "readNext", - "owner" : "ia", - "name" : "w", - "access" : 0, - "descriptor" : "(Lgr;IB)V" + "descriptor" : "(B)Lco;" } ], "constructors" : [ { "access" : 0, "descriptor" : "()V" } ] }, { - "class" : "IndexStore", + "class" : "ArchiveDisk", "name" : "ff", "super" : "java.lang.Object", "access" : 49, "interfaces" : [ ], "fields" : [ { - "field" : "dataFile", - "owner" : "ff", - "name" : "f", - "access" : 0, - "descriptor" : "Ldy;" - }, { - "field" : "index", + "field" : "archive", "owner" : "ff", "name" : "w", "access" : 0, "descriptor" : "I", "decoder" : -1982523283 }, { - "field" : "indexFile", + "field" : "datFile", + "owner" : "ff", + "name" : "f", + "access" : 0, + "descriptor" : "Ldy;" + }, { + "field" : "idxFile", "owner" : "ff", "name" : "q", "access" : 0, @@ -3428,117 +3673,383 @@ "descriptor" : "(ILdy;Ldy;I)V" } ] }, { - "class" : "Entity", - "name" : "ex", - "super" : "fn", - "access" : 1057, + "class" : "GroundItem", + "name" : "ck", + "super" : "ex", + "access" : 49, "interfaces" : [ ], "fields" : [ { - "field" : "height", - "owner" : "ex", - "name" : "cw", - "access" : 1, + "field" : "id", + "owner" : "ck", + "name" : "m", + "access" : 0, "descriptor" : "I", - "decoder" : 849583845 + "decoder" : 893970699 + }, { + "field" : "quantity", + "owner" : "ck", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : 454094667 } ], "methods" : [ { - "method" : "draw", - "owner" : "ex", - "name" : "cy", - "access" : 0, - "parameters" : [ "yaw", "cameraPitchSine", "cameraPitchCosine", "cameraYawSine", "cameraYawCosine", "x", "y", "z", "tag" ], - "descriptor" : "(IIIIIIIIJ)V" - }, { "method" : "getModel", - "owner" : "ex", + "owner" : "ck", "name" : "e", - "access" : 4, + "access" : 20, "parameters" : [ ], "descriptor" : "(I)Ldu;" } ], "constructors" : [ { - "access" : 4, + "access" : 0, "descriptor" : "()V" } ] }, { - "class" : "DirectWrapper", - "name" : "ew", - "super" : "eu", + "class" : "VarpDefinition", + "name" : "ix", + "super" : "fn", "access" : 33, "interfaces" : [ ], "fields" : [ { - "field" : "obj", - "owner" : "ew", - "name" : "m", - "access" : 0, - "descriptor" : "Ljava/lang/Object;" + "field" : "type", + "owner" : "ix", + "name" : "w", + "access" : 1, + "descriptor" : "I", + "decoder" : -1792568421 } ], "methods" : [ { - "method" : "get", - "owner" : "ew", - "name" : "m", - "access" : 0, - "parameters" : [ ], - "descriptor" : "()Ljava/lang/Object;" - }, { - "method" : "isSoft", - "owner" : "ew", + "method" : "decode", + "owner" : "ix", "name" : "f", "access" : 0, - "parameters" : [ ], - "descriptor" : "()Z" + "descriptor" : "(Lgr;B)V" + }, { + "method" : "decode0", + "owner" : "ix", + "name" : "q", + "access" : 0, + "descriptor" : "(Lgr;II)V" } ], "constructors" : [ { "access" : 0, - "descriptor" : "(Ljava/lang/Object;I)V" + "descriptor" : "()V" } ] }, { - "class" : "FloorDecoration", - "name" : "do", + "class" : "Font", + "name" : "kk", + "super" : "kt", + "access" : 49, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ { + "method" : "drawGlyph", + "owner" : "kk", + "name" : "m", + "access" : 16, + "descriptor" : "([BIIIII)V" + }, { + "method" : "drawGlyphAlpha", + "owner" : "kk", + "name" : "f", + "access" : 16, + "descriptor" : "([BIIIIII)V" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "([B[I[I[I[I[I[[B)V" + }, { + "access" : 1, + "descriptor" : "([B)V" + } ] +}, { + "class" : "ChatChannel", + "name" : "cp", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "count", + "owner" : "cp", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : 612486877 + }, { + "field" : "messages", + "owner" : "cp", + "name" : "f", + "access" : 0, + "descriptor" : "[Lbm;" + } ], + "methods" : [ { + "method" : "addMessage", + "owner" : "cp", + "name" : "m", + "access" : 0, + "parameters" : [ "type", "sender", "text", "prefix" ], + "descriptor" : "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lbm;" + }, { + "method" : "getMessage", + "owner" : "cp", + "name" : "f", + "access" : 0, + "parameters" : [ "index" ], + "descriptor" : "(II)Lbm;" + }, { + "method" : "size", + "owner" : "cp", + "name" : "q", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)I" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "PlatformInfoProvider", + "name" : "lm", + "super" : "java.lang.Object", + "access" : 1537, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ { + "method" : "get", + "owner" : "lm", + "name" : "m", + "access" : 1025, + "parameters" : [ ], + "descriptor" : "(I)Llb;" + } ], + "constructors" : [ ] +}, { + "class" : "DynamicObject", + "name" : "cf", + "super" : "ex", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "cycleStart", + "owner" : "cf", + "name" : "e", + "access" : 0, + "descriptor" : "I", + "decoder" : -1596313489 + }, { + "field" : "frame", + "owner" : "cf", + "name" : "l", + "access" : 0, + "descriptor" : "I", + "decoder" : -2017547185 + }, { + "field" : "id", + "owner" : "cf", + "name" : "m", + "access" : 0, + "descriptor" : "I", + "decoder" : 1369707199 + }, { + "field" : "orientation", + "owner" : "cf", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : 141031459 + }, { + "field" : "plane", + "owner" : "cf", + "name" : "w", + "access" : 0, + "descriptor" : "I", + "decoder" : 844945979 + }, { + "field" : "sequenceDefinition", + "owner" : "cf", + "name" : "g", + "access" : 0, + "descriptor" : "Ljh;" + }, { + "field" : "type", + "owner" : "cf", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : 1713856147 + }, { + "field" : "x", + "owner" : "cf", + "name" : "o", + "access" : 0, + "descriptor" : "I", + "decoder" : -351084819 + }, { + "field" : "y", + "owner" : "cf", + "name" : "u", + "access" : 0, + "descriptor" : "I", + "decoder" : -126308963 + } ], + "methods" : [ { + "method" : "getModel", + "owner" : "cf", + "name" : "e", + "access" : 20, + "parameters" : [ ], + "descriptor" : "(I)Ldu;" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(IIIIIIIZLex;)V" + } ] +}, { + "class" : "ClanMate", + "name" : "jk", + "super" : "ke", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "isFriend0", + "owner" : "jk", + "name" : "m", + "access" : 0, + "descriptor" : "Lkd;" + }, { + "field" : "isIgnored0", + "owner" : "jk", + "name" : "f", + "access" : 0, + "descriptor" : "Lkd;" + } ], + "methods" : [ { + "method" : "clearIsFriend", + "owner" : "jk", + "name" : "m", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "clearIsIgnored", + "owner" : "jk", + "name" : "w", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "fillIsFriend", + "owner" : "jk", + "name" : "q", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "fillIsIgnored", + "owner" : "jk", + "name" : "u", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "isFriend", + "owner" : "jk", + "name" : "f", + "access" : 17, + "parameters" : [ ], + "descriptor" : "(I)Z" + }, { + "method" : "isIgnored", + "owner" : "jk", + "name" : "o", + "access" : 17, + "parameters" : [ ], + "descriptor" : "(I)Z" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "DesktopPlatformInfoProvider", + "name" : "lu", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ "lm" ], + "fields" : [ ], + "methods" : [ { + "method" : "get", + "owner" : "lu", + "name" : "m", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)Llb;" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "()V" + } ] +}, { + "class" : "GroundItemPile", + "name" : "dr", "super" : "java.lang.Object", "access" : 49, "interfaces" : [ ], "fields" : [ { - "field" : "entity", - "owner" : "do", + "field" : "first", + "owner" : "dr", "name" : "o", - "access" : 1, + "access" : 0, "descriptor" : "Lex;" }, { - "field" : "flags", - "owner" : "do", - "name" : "u", + "field" : "height", + "owner" : "dr", + "name" : "l", "access" : 0, "descriptor" : "I", - "decoder" : -1241982749 + "decoder" : -1659262853 + }, { + "field" : "second", + "owner" : "dr", + "name" : "m", + "access" : 0, + "descriptor" : "Lex;" }, { "field" : "tag", - "owner" : "do", - "name" : "m", - "access" : 1, + "owner" : "dr", + "name" : "g", + "access" : 0, "descriptor" : "J", - "decoder" : -5063688075016130813 + "decoder" : -3696674445500472687 + }, { + "field" : "third", + "owner" : "dr", + "name" : "u", + "access" : 0, + "descriptor" : "Lex;" }, { "field" : "tileHeight", - "owner" : "do", + "owner" : "dr", "name" : "f", "access" : 0, "descriptor" : "I", - "decoder" : -1358154703 + "decoder" : -325682933 }, { "field" : "x", - "owner" : "do", + "owner" : "dr", "name" : "q", "access" : 0, "descriptor" : "I", - "decoder" : 1309467119 + "decoder" : -1363136655 }, { "field" : "y", - "owner" : "do", + "owner" : "dr", "name" : "w", "access" : 0, "descriptor" : "I", - "decoder" : 318503957 + "decoder" : 968072997 } ], "methods" : [ ], "constructors" : [ { @@ -3546,32 +4057,116 @@ "descriptor" : "()V" } ] }, { - "class" : "InvDefinition", - "name" : "ib", - "super" : "fn", + "class" : "DemotingHashTable", + "name" : "ec", + "super" : "java.lang.Object", + "access" : 49, + "interfaces" : [ ], + "fields" : [ { + "field" : "capacity", + "owner" : "ec", + "name" : "m", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "hashTable", + "owner" : "ec", + "name" : "q", + "access" : 0, + "descriptor" : "Llh;" + }, { + "field" : "queue", + "owner" : "ec", + "name" : "w", + "access" : 0, + "descriptor" : "Ljc;" + }, { + "field" : "remaining", + "owner" : "ec", + "name" : "f", + "access" : 0, + "descriptor" : "I" + } ], + "methods" : [ { + "method" : "clear", + "owner" : "ec", + "name" : "u", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "demote", + "owner" : "ec", + "name" : "o", + "access" : 1, + "parameters" : [ "softeningLevel" ], + "descriptor" : "(I)V" + }, { + "method" : "get", + "owner" : "ec", + "name" : "m", + "access" : 1, + "parameters" : [ "key" ], + "descriptor" : "(J)Ljava/lang/Object;" + }, { + "method" : "put", + "owner" : "ec", + "name" : "w", + "access" : 1, + "parameters" : [ "value", "key", "size" ], + "descriptor" : "(Ljava/lang/Object;JI)V" + }, { + "method" : "remove", + "owner" : "ec", + "name" : "f", + "access" : 0, + "parameters" : [ "key" ], + "descriptor" : "(J)V" + }, { + "method" : "removeWrapper", + "owner" : "ec", + "name" : "q", + "access" : 0, + "parameters" : [ "wrapper" ], + "descriptor" : "(Leu;)V" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(II)V" + } ] +}, { + "class" : "ScriptFrame", + "name" : "bn", + "super" : "java.lang.Object", "access" : 33, "interfaces" : [ ], "fields" : [ { - "field" : "size", - "owner" : "ib", + "field" : "intLocals", + "owner" : "bn", "name" : "q", - "access" : 1, - "descriptor" : "I", - "decoder" : 1358868971 - } ], - "methods" : [ { - "method" : "read", - "owner" : "ib", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "pc", + "owner" : "bn", "name" : "f", "access" : 0, - "descriptor" : "(Lgr;I)V" + "descriptor" : "I", + "decoder" : -1715361849 }, { - "method" : "readNext", - "owner" : "ib", - "name" : "q", + "field" : "script", + "owner" : "bn", + "name" : "m", "access" : 0, - "descriptor" : "(Lgr;II)V" + "descriptor" : "Lcg;" + }, { + "field" : "stringLocals", + "owner" : "bn", + "name" : "w", + "access" : 0, + "descriptor" : "[Ljava/lang/String;" } ], + "methods" : [ ], "constructors" : [ { "access" : 0, "descriptor" : "()V" @@ -3649,183 +4244,6 @@ "access" : 0, "descriptor" : "()V" } ] -}, { - "class" : "Interpreter", - "name" : "bv", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ ], - "constructors" : [ ] -}, { - "class" : "PcmPlayerProvider", - "name" : "cz", - "super" : "java.lang.Object", - "access" : 1537, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ { - "method" : "player", - "owner" : "cz", - "name" : "m", - "access" : 1025, - "descriptor" : "(B)Lco;" - } ], - "constructors" : [ ] -}, { - "class" : "SpriteMask", - "name" : "hp", - "super" : "fn", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "height", - "owner" : "hp", - "name" : "f", - "access" : 17, - "descriptor" : "I", - "decoder" : -193097093 - }, { - "field" : "width", - "owner" : "hp", - "name" : "m", - "access" : 17, - "descriptor" : "I", - "decoder" : 574541221 - }, { - "field" : "xStarts", - "owner" : "hp", - "name" : "w", - "access" : 17, - "descriptor" : "[I" - }, { - "field" : "xWidths", - "owner" : "hp", - "name" : "q", - "access" : 17, - "descriptor" : "[I" - } ], - "methods" : [ { - "method" : "contains", - "owner" : "hp", - "name" : "m", - "access" : 1, - "parameters" : [ "x", "y" ], - "descriptor" : "(III)Z" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(II[I[II)V" - } ] -}, { - "class" : "Tiles", - "name" : "bq", - "super" : "java.lang.Object", - "access" : 49, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ ], - "constructors" : [ ] -}, { - "class" : "ChatChannel", - "name" : "cp", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "count", - "owner" : "cp", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : 612486877 - }, { - "field" : "messages", - "owner" : "cp", - "name" : "f", - "access" : 0, - "descriptor" : "[Lbm;" - } ], - "methods" : [ { - "method" : "addMessage", - "owner" : "cp", - "name" : "m", - "access" : 0, - "parameters" : [ "type", "sender", "text", "prefix" ], - "descriptor" : "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lbm;" - }, { - "method" : "getMessage", - "owner" : "cp", - "name" : "f", - "access" : 0, - "parameters" : [ "index" ], - "descriptor" : "(II)Lbm;" - }, { - "method" : "size", - "owner" : "cp", - "name" : "q", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)I" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "PlatformInfoProvider", - "name" : "lm", - "super" : "java.lang.Object", - "access" : 1537, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ { - "method" : "get", - "owner" : "lm", - "name" : "m", - "access" : 1025, - "parameters" : [ ], - "descriptor" : "(I)Llb;" - } ], - "constructors" : [ ] -}, { - "class" : "IgnoreList", - "name" : "kj", - "super" : "km", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "loginType", - "owner" : "kj", - "name" : "q", - "access" : 16, - "descriptor" : "Llx;" - } ], - "methods" : [ { - "method" : "newInstance", - "owner" : "kj", - "name" : "m", - "access" : 0, - "descriptor" : "(I)Ljs;" - }, { - "method" : "newTypedArray", - "owner" : "kj", - "name" : "f", - "access" : 0, - "descriptor" : "(II)[Ljs;" - }, { - "method" : "read", - "owner" : "kj", - "name" : "q", - "access" : 1, - "parameters" : [ "buffer", "n" ], - "descriptor" : "(Lgr;IB)V" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(Llx;)V" - } ] }, { "class" : "WallDecoration", "name" : "eq", @@ -3914,566 +4332,29 @@ "descriptor" : "()V" } ] }, { - "class" : "DynamicObject", - "name" : "cf", - "super" : "ex", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "cycleStart", - "owner" : "cf", - "name" : "e", - "access" : 0, - "descriptor" : "I", - "decoder" : -1596313489 - }, { - "field" : "frame", - "owner" : "cf", - "name" : "l", - "access" : 0, - "descriptor" : "I", - "decoder" : -2017547185 - }, { - "field" : "id", - "owner" : "cf", - "name" : "m", - "access" : 0, - "descriptor" : "I", - "decoder" : 1369707199 - }, { - "field" : "orientation", - "owner" : "cf", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : 141031459 - }, { - "field" : "plane", - "owner" : "cf", - "name" : "w", - "access" : 0, - "descriptor" : "I", - "decoder" : 844945979 - }, { - "field" : "sequenceDefinition", - "owner" : "cf", - "name" : "g", - "access" : 0, - "descriptor" : "Ljh;" - }, { - "field" : "type", - "owner" : "cf", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : 1713856147 - }, { - "field" : "x", - "owner" : "cf", - "name" : "o", - "access" : 0, - "descriptor" : "I", - "decoder" : -351084819 - }, { - "field" : "y", - "owner" : "cf", - "name" : "u", - "access" : 0, - "descriptor" : "I", - "decoder" : -126308963 - } ], - "methods" : [ { - "method" : "getModel", - "owner" : "cf", - "name" : "e", - "access" : 20, - "parameters" : [ ], - "descriptor" : "(I)Ldu;" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(IIIIIIIZLex;)V" - } ] -}, { - "class" : "StructDefinition", - "name" : "jq", - "super" : "fn", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "params", - "owner" : "jq", - "name" : "q", - "access" : 0, - "descriptor" : "Llh;" - } ], - "methods" : [ { - "method" : "getIntParam", - "owner" : "jq", - "name" : "o", - "access" : 1, - "descriptor" : "(IIB)I" - }, { - "method" : "getStringParam", - "owner" : "jq", - "name" : "u", - "access" : 1, - "descriptor" : "(ILjava/lang/String;I)Ljava/lang/String;" - }, { - "method" : "init", - "owner" : "jq", - "name" : "f", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(B)V" - }, { - "method" : "read", - "owner" : "jq", - "name" : "q", - "access" : 0, - "descriptor" : "(Lgr;I)V" - }, { - "method" : "readNext", - "owner" : "jq", - "name" : "w", - "access" : 0, - "descriptor" : "(Lgr;II)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "SoftWrapper", - "name" : "ef", - "super" : "eu", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "ref", - "owner" : "ef", - "name" : "m", - "access" : 0, - "descriptor" : "Ljava/lang/ref/SoftReference;" - } ], - "methods" : [ { - "method" : "get", - "owner" : "ef", - "name" : "m", - "access" : 0, - "parameters" : [ ], - "descriptor" : "()Ljava/lang/Object;" - }, { - "method" : "isSoft", - "owner" : "ef", - "name" : "f", - "access" : 0, - "parameters" : [ ], - "descriptor" : "()Z" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Ljava/lang/Object;I)V" - } ] -}, { - "class" : "DesktopPlatformInfoProvider", - "name" : "lu", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ "lm" ], - "fields" : [ ], - "methods" : [ { - "method" : "get", - "owner" : "lu", - "name" : "m", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)Llb;" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "()V" - } ] -}, { - "class" : "GroundItem", - "name" : "ck", - "super" : "ex", - "access" : 49, - "interfaces" : [ ], - "fields" : [ { - "field" : "id", - "owner" : "ck", - "name" : "m", - "access" : 0, - "descriptor" : "I", - "decoder" : 893970699 - }, { - "field" : "quantity", - "owner" : "ck", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : 454094667 - } ], - "methods" : [ { - "method" : "getModel", - "owner" : "ck", - "name" : "e", - "access" : 20, - "parameters" : [ ], - "descriptor" : "(I)Ldu;" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "VarpDefinition", - "name" : "ix", - "super" : "fn", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "type", - "owner" : "ix", - "name" : "w", - "access" : 1, - "descriptor" : "I", - "decoder" : -1792568421 - } ], - "methods" : [ { - "method" : "read", - "owner" : "ix", - "name" : "f", - "access" : 0, - "descriptor" : "(Lgr;B)V" - }, { - "method" : "readNext", - "owner" : "ix", - "name" : "q", - "access" : 0, - "descriptor" : "(Lgr;II)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "Rasterizer3D", - "name" : "et", - "super" : "lf", - "access" : 33, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ ], - "constructors" : [ ] -}, { - "class" : "AttackOption", - "name" : "cj", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ "gc" ], - "fields" : [ { - "field" : "id", - "owner" : "cj", - "name" : "o", - "access" : 16, - "descriptor" : "I", - "decoder" : -1461217963 - } ], - "methods" : [ { - "method" : "ordinal", - "owner" : "cj", - "name" : "f", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)I" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(I)V" - } ] -}, { - "class" : "GroundItemPile", - "name" : "dr", - "super" : "java.lang.Object", - "access" : 49, - "interfaces" : [ ], - "fields" : [ { - "field" : "first", - "owner" : "dr", - "name" : "o", - "access" : 0, - "descriptor" : "Lex;" - }, { - "field" : "height", - "owner" : "dr", - "name" : "l", - "access" : 0, - "descriptor" : "I", - "decoder" : -1659262853 - }, { - "field" : "second", - "owner" : "dr", - "name" : "m", - "access" : 0, - "descriptor" : "Lex;" - }, { - "field" : "tag", - "owner" : "dr", - "name" : "g", - "access" : 0, - "descriptor" : "J", - "decoder" : -3696674445500472687 - }, { - "field" : "third", - "owner" : "dr", - "name" : "u", - "access" : 0, - "descriptor" : "Lex;" - }, { - "field" : "tileHeight", - "owner" : "dr", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : -325682933 - }, { - "field" : "x", - "owner" : "dr", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : -1363136655 - }, { - "field" : "y", - "owner" : "dr", - "name" : "w", - "access" : 0, - "descriptor" : "I", - "decoder" : 968072997 - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "Font", - "name" : "kk", - "super" : "kt", - "access" : 49, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ { - "method" : "drawGlyph", - "owner" : "kk", - "name" : "m", - "access" : 16, - "descriptor" : "([BIIIII)V" - }, { - "method" : "drawGlyphAlpha", - "owner" : "kk", - "name" : "f", - "access" : 16, - "descriptor" : "([BIIIIII)V" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "([B[I[I[I[I[I[[B)V" - }, { - "access" : 1, - "descriptor" : "([B)V" - } ] -}, { - "class" : "Messages", - "name" : "cw", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ ], - "constructors" : [ ] -}, { - "class" : "Frames", - "name" : "en", - "super" : "fn", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "frames", - "owner" : "en", - "name" : "m", - "access" : 0, - "descriptor" : "[Ldz;" - } ], - "methods" : [ { - "method" : "hasAlphaTransform", - "owner" : "en", - "name" : "m", - "access" : 1, - "parameters" : [ "frame" ], - "descriptor" : "(II)Z" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(Lir;Lir;IZ)V" - } ] -}, { - "class" : "ScriptFrame", - "name" : "bn", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "intLocals", - "owner" : "bn", - "name" : "q", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "pc", - "owner" : "bn", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : -1715361849 - }, { - "field" : "script", - "owner" : "bn", - "name" : "m", - "access" : 0, - "descriptor" : "Lcg;" - }, { - "field" : "stringLocals", - "owner" : "bn", - "name" : "w", - "access" : 0, - "descriptor" : "[Ljava/lang/String;" - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "GraphicsObject", - "name" : "bw", - "super" : "ex", - "access" : 49, - "interfaces" : [ ], - "fields" : [ { - "field" : "cycleStart", - "owner" : "bw", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : -1245488067 - }, { - "field" : "frame", - "owner" : "bw", - "name" : "l", - "access" : 0, - "descriptor" : "I", - "decoder" : 1541221595 - }, { - "field" : "frameCycle", - "owner" : "bw", - "name" : "e", - "access" : 0, - "descriptor" : "I", - "decoder" : -1950327625 - }, { - "field" : "height", - "owner" : "bw", - "name" : "u", - "access" : 0, - "descriptor" : "I", - "decoder" : 1156757009 - }, { - "field" : "id", - "owner" : "bw", - "name" : "m", - "access" : 0, - "descriptor" : "I", - "decoder" : -289084031 - }, { - "field" : "isFinished", - "owner" : "bw", - "name" : "x", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "plane", - "owner" : "bw", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : 432847573 - }, { - "field" : "sequenceDefinition", - "owner" : "bw", - "name" : "g", - "access" : 0, - "descriptor" : "Ljh;" - }, { - "field" : "x", - "owner" : "bw", - "name" : "w", - "access" : 0, - "descriptor" : "I", - "decoder" : -1189549567 - }, { - "field" : "y", - "owner" : "bw", - "name" : "o", - "access" : 0, - "descriptor" : "I", - "decoder" : 1416438985 - } ], - "methods" : [ { - "method" : "advance", - "owner" : "bw", - "name" : "m", - "access" : 16, - "parameters" : [ "cycles" ], - "descriptor" : "(II)V" - }, { - "method" : "getModel", - "owner" : "bw", - "name" : "e", - "access" : 20, - "parameters" : [ ], - "descriptor" : "(I)Ldu;" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(IIIIIII)V" - } ] -}, { - "class" : "IndexStoreAction", + "class" : "ArchiveDiskAction", "name" : "ik", "super" : "gw", "access" : 33, "interfaces" : [ ], "fields" : [ { - "field" : "data", - "owner" : "ik", - "name" : "f", - "access" : 0, - "descriptor" : "[B" - }, { - "field" : "indexCache", + "field" : "archive", "owner" : "ik", "name" : "w", "access" : 0, "descriptor" : "Lit;" }, { - "field" : "indexStore", + "field" : "archiveDisk", "owner" : "ik", "name" : "q", "access" : 0, "descriptor" : "Lff;" + }, { + "field" : "data", + "owner" : "ik", + "name" : "f", + "access" : 0, + "descriptor" : "[B" }, { "field" : "type", "owner" : "ik", @@ -4686,23 +4567,152 @@ "descriptor" : "(IIIIIIIIIII)V" } ] }, { - "class" : "DevicePcmPlayerProvider", - "name" : "az", + "class" : "FloorDecoration", + "name" : "do", "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ "cz" ], - "fields" : [ ], - "methods" : [ { - "method" : "player", - "owner" : "az", + "access" : 49, + "interfaces" : [ ], + "fields" : [ { + "field" : "entity", + "owner" : "do", + "name" : "o", + "access" : 1, + "descriptor" : "Lex;" + }, { + "field" : "flags", + "owner" : "do", + "name" : "u", + "access" : 0, + "descriptor" : "I", + "decoder" : -1241982749 + }, { + "field" : "tag", + "owner" : "do", "name" : "m", "access" : 1, - "descriptor" : "(B)Lco;" + "descriptor" : "J", + "decoder" : -5063688075016130813 + }, { + "field" : "tileHeight", + "owner" : "do", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : -1358154703 + }, { + "field" : "x", + "owner" : "do", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : 1309467119 + }, { + "field" : "y", + "owner" : "do", + "name" : "w", + "access" : 0, + "descriptor" : "I", + "decoder" : 318503957 } ], + "methods" : [ ], "constructors" : [ { "access" : 0, "descriptor" : "()V" } ] +}, { + "class" : "GraphicsObject", + "name" : "bw", + "super" : "ex", + "access" : 49, + "interfaces" : [ ], + "fields" : [ { + "field" : "cycleStart", + "owner" : "bw", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : -1245488067 + }, { + "field" : "frame", + "owner" : "bw", + "name" : "l", + "access" : 0, + "descriptor" : "I", + "decoder" : 1541221595 + }, { + "field" : "frameCycle", + "owner" : "bw", + "name" : "e", + "access" : 0, + "descriptor" : "I", + "decoder" : -1950327625 + }, { + "field" : "height", + "owner" : "bw", + "name" : "u", + "access" : 0, + "descriptor" : "I", + "decoder" : 1156757009 + }, { + "field" : "id", + "owner" : "bw", + "name" : "m", + "access" : 0, + "descriptor" : "I", + "decoder" : -289084031 + }, { + "field" : "isFinished", + "owner" : "bw", + "name" : "x", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "plane", + "owner" : "bw", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : 432847573 + }, { + "field" : "sequenceDefinition", + "owner" : "bw", + "name" : "g", + "access" : 0, + "descriptor" : "Ljh;" + }, { + "field" : "x", + "owner" : "bw", + "name" : "w", + "access" : 0, + "descriptor" : "I", + "decoder" : -1189549567 + }, { + "field" : "y", + "owner" : "bw", + "name" : "o", + "access" : 0, + "descriptor" : "I", + "decoder" : 1416438985 + } ], + "methods" : [ { + "method" : "advance", + "owner" : "bw", + "name" : "m", + "access" : 16, + "parameters" : [ "cycles" ], + "descriptor" : "(II)V" + }, { + "method" : "getModel", + "owner" : "bw", + "name" : "e", + "access" : 20, + "parameters" : [ ], + "descriptor" : "(I)Ldu;" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(IIIIIII)V" + } ] }, { "class" : "ViewportMouse", "name" : "dm", @@ -4712,6 +4722,15 @@ "fields" : [ ], "methods" : [ ], "constructors" : [ ] +}, { + "class" : "Tiles", + "name" : "bq", + "super" : "java.lang.Object", + "access" : 49, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ ], + "constructors" : [ ] }, { "class" : "Players", "name" : "cq", @@ -7128,13 +7147,13 @@ "descriptor" : "()V" } ] }, { - "class" : "IndexCacheLoader", + "class" : "ArchiveLoader", "name" : "bd", "super" : "java.lang.Object", "access" : 33, "interfaces" : [ ], "fields" : [ { - "field" : "indexCache", + "field" : "archive", "owner" : "bd", "name" : "f", "access" : 16, @@ -7184,6 +7203,12 @@ "name" : "f", "access" : 0, "descriptor" : "Z" + }, { + "field" : "component", + "owner" : "by", + "name" : "q", + "access" : 0, + "descriptor" : "Lho;" }, { "field" : "dragTarget", "owner" : "by", @@ -7193,17 +7218,17 @@ }, { "field" : "keyPressed", "owner" : "by", - "name" : "e", - "access" : 0, - "descriptor" : "I", - "decoder" : 327085889 - }, { - "field" : "keyTyped", - "owner" : "by", "name" : "l", "access" : 0, "descriptor" : "I", "decoder" : -1330602393 + }, { + "field" : "keyTyped", + "owner" : "by", + "name" : "e", + "access" : 0, + "descriptor" : "I", + "decoder" : 327085889 }, { "field" : "mouseX", "owner" : "by", @@ -7238,12 +7263,6 @@ "access" : 0, "descriptor" : "I", "decoder" : -161292529 - }, { - "field" : "widget", - "owner" : "by", - "name" : "q", - "access" : 0, - "descriptor" : "Lho;" }, { "field" : "__d", "owner" : "by", @@ -7689,48 +7708,41 @@ "descriptor" : "I", "decoder" : -779457309 }, { - "field" : "hitSplatCount", + "field" : "hitmarkCount", "owner" : "bz", "name" : "af", "access" : 0, "descriptor" : "B" }, { - "field" : "hitSplatCycles", + "field" : "hitmarkCycles", "owner" : "bz", "name" : "bb", "access" : 0, "descriptor" : "[I" }, { - "field" : "hitSplatTypes", + "field" : "hitmarkTypes", "owner" : "bz", "name" : "ai", "access" : 0, "descriptor" : "[I" }, { - "field" : "hitSplatTypes2", + "field" : "hitmarkTypes2", "owner" : "bz", "name" : "bs", "access" : 0, "descriptor" : "[I" }, { - "field" : "hitSplatValues", + "field" : "hitmarkValues", "owner" : "bz", "name" : "ba", "access" : 0, "descriptor" : "[I" }, { - "field" : "hitSplatValues2", + "field" : "hitmarkValues2", "owner" : "bz", "name" : "bq", "access" : 0, "descriptor" : "[I" - }, { - "field" : "idleSequence", - "owner" : "bz", - "name" : "aw", - "access" : 0, - "descriptor" : "I", - "decoder" : -299122235 }, { "field" : "isAutoChatting", "owner" : "bz", @@ -7831,6 +7843,13 @@ "access" : 0, "descriptor" : "I", "decoder" : 141226463 + }, { + "field" : "readySequence", + "owner" : "bz", + "name" : "aw", + "access" : 0, + "descriptor" : "I", + "decoder" : -299122235 }, { "field" : "runSequence", "owner" : "bz", @@ -7916,33 +7935,33 @@ "descriptor" : "I", "decoder" : 1788714977 }, { - "field" : "walkSequence", + "field" : "walkBackSequence", "owner" : "bz", - "name" : "ae", + "name" : "at", "access" : 0, "descriptor" : "I", - "decoder" : -2075997699 + "decoder" : -1598871111 }, { - "field" : "walkTurnLeftSequence", + "field" : "walkLeftSequence", "owner" : "bz", "name" : "ad", "access" : 0, "descriptor" : "I", "decoder" : -568830521 }, { - "field" : "walkTurnRightSequence", + "field" : "walkRightSequence", "owner" : "bz", "name" : "ap", "access" : 0, "descriptor" : "I", "decoder" : -257240117 }, { - "field" : "walkTurnSequence", + "field" : "walkSequence", "owner" : "bz", - "name" : "at", + "name" : "ae", "access" : 0, "descriptor" : "I", - "decoder" : -1598871111 + "decoder" : -2075997699 }, { "field" : "x", "owner" : "bz", @@ -8083,7 +8102,7 @@ "parameters" : [ "healthBarDefinition", "cycle", "n0", "n1", "n2", "n3" ], "descriptor" : "(IIIIIIB)V" }, { - "method" : "addHitSplat", + "method" : "addHitmark", "owner" : "bz", "name" : "bs", "access" : 16, @@ -10198,6 +10217,12 @@ "access" : 33, "interfaces" : [ "ei" ], "fields" : [ { + "field" : "archive", + "owner" : "dl", + "name" : "g", + "access" : 0, + "descriptor" : "Lir;" + }, { "field" : "brightness0", "owner" : "dl", "name" : "o", @@ -10216,12 +10241,6 @@ "name" : "f", "access" : 0, "descriptor" : "Lje;" - }, { - "field" : "indexCache", - "owner" : "dl", - "name" : "g", - "access" : 0, - "descriptor" : "Lir;" }, { "field" : "remaining", "owner" : "dl", @@ -10786,6 +10805,12 @@ "name" : "k", "access" : 0, "descriptor" : "I" + }, { + "field" : "files", + "owner" : "dh", + "name" : "g", + "access" : 0, + "descriptor" : "[I" }, { "field" : "int1", "owner" : "dh", @@ -10804,12 +10829,6 @@ "name" : "n", "access" : 0, "descriptor" : "[I" - }, { - "field" : "records", - "owner" : "dh", - "name" : "g", - "access" : 0, - "descriptor" : "[I" }, { "field" : "__u", "owner" : "dh", @@ -15302,19 +15321,12 @@ "descriptor" : "(Lgr;)V" } ] }, { - "class" : "TileLocation", + "class" : "Coord", "name" : "hu", "super" : "java.lang.Object", "access" : 33, "interfaces" : [ ], "fields" : [ { - "field" : "plane", - "owner" : "hu", - "name" : "m", - "access" : 1, - "descriptor" : "I", - "decoder" : 503621925 - }, { "field" : "x", "owner" : "hu", "name" : "f", @@ -15324,6 +15336,13 @@ }, { "field" : "y", "owner" : "hu", + "name" : "m", + "access" : 1, + "descriptor" : "I", + "decoder" : 503621925 + }, { + "field" : "z", + "owner" : "hu", "name" : "q", "access" : 1, "descriptor" : "I", @@ -15496,7 +15515,7 @@ "descriptor" : "()V" } ] }, { - "class" : "Widget", + "class" : "Component", "name" : "ho", "super" : "gw", "access" : 33, @@ -15540,6 +15559,13 @@ "access" : 1, "descriptor" : "I", "decoder" : 1856618959 + }, { + "field" : "clientCode", + "owner" : "ho", + "name" : "c", + "access" : 1, + "descriptor" : "I", + "decoder" : -581762425 }, { "field" : "color", "owner" : "ho", @@ -15554,13 +15580,6 @@ "access" : 1, "descriptor" : "I", "decoder" : -365781561 - }, { - "field" : "contentType", - "owner" : "ho", - "name" : "c", - "access" : 1, - "descriptor" : "I", - "decoder" : -581762425 }, { "field" : "cs1ComparisonValues", "owner" : "ho", @@ -15796,6 +15815,12 @@ "name" : "be", "access" : 1, "descriptor" : "Z" + }, { + "field" : "modelTransparency", + "owner" : "ho", + "name" : "bv", + "access" : 1, + "descriptor" : "Z" }, { "field" : "modelType", "owner" : "ho", @@ -15844,6 +15869,18 @@ "name" : "fx", "access" : 1, "descriptor" : "Z" + }, { + "field" : "onChatTransmit", + "owner" : "ho", + "name" : "em", + "access" : 1, + "descriptor" : "[Ljava/lang/Object;" + }, { + "field" : "onClanTransmit", + "owner" : "ho", + "name" : "ej", + "access" : 1, + "descriptor" : "[Ljava/lang/Object;" }, { "field" : "onClick", "owner" : "ho", @@ -15856,6 +15893,12 @@ "name" : "dg", "access" : 1, "descriptor" : "[Ljava/lang/Object;" + }, { + "field" : "onDialogAbort", + "owner" : "ho", + "name" : "en", + "access" : 1, + "descriptor" : "[Ljava/lang/Object;" }, { "field" : "onDrag", "owner" : "ho", @@ -15868,6 +15911,12 @@ "name" : "dw", "access" : 1, "descriptor" : "[Ljava/lang/Object;" + }, { + "field" : "onFriendTransmit", + "owner" : "ho", + "name" : "ex", + "access" : 1, + "descriptor" : "[Ljava/lang/Object;" }, { "field" : "onHold", "owner" : "ho", @@ -15880,12 +15929,24 @@ "name" : "dj", "access" : 1, "descriptor" : "[Ljava/lang/Object;" + }, { + "field" : "onKey", + "owner" : "ho", + "name" : "ed", + "access" : 1, + "descriptor" : "[Ljava/lang/Object;" }, { "field" : "onLoad", "owner" : "ho", "name" : "di", "access" : 1, "descriptor" : "[Ljava/lang/Object;" + }, { + "field" : "onMiscTransmit", + "owner" : "ho", + "name" : "el", + "access" : 1, + "descriptor" : "[Ljava/lang/Object;" }, { "field" : "onMouseLeave", "owner" : "ho", @@ -15917,7 +15978,7 @@ "access" : 1, "descriptor" : "[Ljava/lang/Object;" }, { - "field" : "onScroll", + "field" : "onScrollWheel", "owner" : "ho", "name" : "ek", "access" : 1, @@ -15928,6 +15989,18 @@ "name" : "dm", "access" : 1, "descriptor" : "[Ljava/lang/Object;" + }, { + "field" : "onStockTransmit", + "owner" : "ho", + "name" : "eq", + "access" : 1, + "descriptor" : "[Ljava/lang/Object;" + }, { + "field" : "onSubChange", + "owner" : "ho", + "name" : "ei", + "access" : 1, + "descriptor" : "[Ljava/lang/Object;" }, { "field" : "onTargetEnter", "owner" : "ho", @@ -16240,12 +16313,6 @@ "name" : "ba", "access" : 1, "descriptor" : "Z" - }, { - "field" : "__bv", - "owner" : "ho", - "name" : "bv", - "access" : 1, - "descriptor" : "Z" }, { "field" : "__cg", "owner" : "ho", @@ -16376,12 +16443,6 @@ "name" : "fh", "access" : 1, "descriptor" : "[I" - }, { - "field" : "__ed", - "owner" : "ho", - "name" : "ed", - "access" : 1, - "descriptor" : "[Ljava/lang/Object;" }, { "field" : "__ee", "owner" : "ho", @@ -16394,48 +16455,6 @@ "name" : "eh", "access" : 1, "descriptor" : "[Ljava/lang/Object;" - }, { - "field" : "__ei", - "owner" : "ho", - "name" : "ei", - "access" : 1, - "descriptor" : "[Ljava/lang/Object;" - }, { - "field" : "__ej", - "owner" : "ho", - "name" : "ej", - "access" : 1, - "descriptor" : "[Ljava/lang/Object;" - }, { - "field" : "__el", - "owner" : "ho", - "name" : "el", - "access" : 1, - "descriptor" : "[Ljava/lang/Object;" - }, { - "field" : "__em", - "owner" : "ho", - "name" : "em", - "access" : 1, - "descriptor" : "[Ljava/lang/Object;" - }, { - "field" : "__en", - "owner" : "ho", - "name" : "en", - "access" : 1, - "descriptor" : "[Ljava/lang/Object;" - }, { - "field" : "__eq", - "owner" : "ho", - "name" : "eq", - "access" : 1, - "descriptor" : "[Ljava/lang/Object;" - }, { - "field" : "__ex", - "owner" : "ho", - "name" : "ex", - "access" : 1, - "descriptor" : "[Ljava/lang/Object;" } ], "methods" : [ { "method" : "decode", @@ -16564,50 +16583,80 @@ "descriptor" : "(IIZZZ)V" } ] }, { - "class" : "AbstractIndexCache", + "class" : "AbstractArchive", "name" : "ir", "super" : "java.lang.Object", "access" : 1057, "interfaces" : [ ], "fields" : [ { - "field" : "archiveCount", + "field" : "fileCounts", + "owner" : "ir", + "name" : "l", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "fileIds", + "owner" : "ir", + "name" : "e", + "access" : 0, + "descriptor" : "[[I" + }, { + "field" : "fileNameHashTables", + "owner" : "ir", + "name" : "d", + "access" : 0, + "descriptor" : "[Llv;" + }, { + "field" : "fileNameHashes", + "owner" : "ir", + "name" : "x", + "access" : 0, + "descriptor" : "[[I" + }, { + "field" : "files", + "owner" : "ir", + "name" : "n", + "access" : 0, + "descriptor" : "[[Ljava/lang/Object;" + }, { + "field" : "groupCount", "owner" : "ir", "name" : "f", "access" : 0, "descriptor" : "I", "decoder" : 1694798923 }, { - "field" : "archiveCrcs", + "field" : "groupCrcs", "owner" : "ir", "name" : "u", "access" : 0, "descriptor" : "[I" }, { - "field" : "archiveIds", + "field" : "groupIds", "owner" : "ir", "name" : "q", "access" : 0, "descriptor" : "[I" }, { - "field" : "archiveNameHashTable", + "field" : "groupNameHashTable", "owner" : "ir", "name" : "o", "access" : 0, "descriptor" : "Llv;" }, { - "field" : "archiveNameHashes", + "field" : "groupNameHashes", "owner" : "ir", "name" : "w", "access" : 0, "descriptor" : "[I" }, { - "field" : "archiveVersions", + "field" : "groupVersions", "owner" : "ir", "name" : "g", "access" : 0, "descriptor" : "[I" }, { - "field" : "archives", + "field" : "groups", "owner" : "ir", "name" : "k", "access" : 0, @@ -16620,164 +16669,134 @@ "descriptor" : "I", "decoder" : -530370811 }, { - "field" : "recordCounts", - "owner" : "ir", - "name" : "l", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "recordIds", - "owner" : "ir", - "name" : "e", - "access" : 0, - "descriptor" : "[[I" - }, { - "field" : "recordNameHashTables", - "owner" : "ir", - "name" : "d", - "access" : 0, - "descriptor" : "[Llv;" - }, { - "field" : "recordNameHashes", - "owner" : "ir", - "name" : "x", - "access" : 0, - "descriptor" : "[[I" - }, { - "field" : "records", - "owner" : "ir", - "name" : "n", - "access" : 0, - "descriptor" : "[[Ljava/lang/Object;" - }, { - "field" : "releaseArchives", + "field" : "releaseGroups", "owner" : "ir", "name" : "z", "access" : 0, "descriptor" : "Z" }, { - "field" : "shallowRecords", + "field" : "shallowFiles", "owner" : "ir", "name" : "j", "access" : 0, "descriptor" : "Z" } ], "methods" : [ { - "method" : "archiveLoadPercent", - "owner" : "ir", - "name" : "e", - "access" : 0, - "descriptor" : "(II)I" - }, { - "method" : "archiveLoadPercentByName", - "owner" : "ir", - "name" : "ac", - "access" : 1, - "parameters" : [ "archiveName" ], - "descriptor" : "(Ljava/lang/String;I)I" - }, { - "method" : "buildRecords", + "method" : "buildFiles", "owner" : "ir", "name" : "c", "access" : 0, - "parameters" : [ "archive", "xteaKey" ], + "parameters" : [ "group", "xteaKey" ], "descriptor" : "(I[II)Z" }, { - "method" : "getArchiveId", - "owner" : "ir", - "name" : "p", - "access" : 1, - "parameters" : [ "archiveName" ], - "descriptor" : "(Ljava/lang/String;I)I" - }, { - "method" : "getRecord", - "owner" : "ir", - "name" : "d", - "access" : 1, - "parameters" : [ "archive", "record" ], - "descriptor" : "(III)[B" - }, { - "method" : "getRecordFlat", - "owner" : "ir", - "name" : "a", - "access" : 1, - "parameters" : [ "archiveOrRecord" ], - "descriptor" : "(IB)[B" - }, { - "method" : "getRecordId", - "owner" : "ir", - "name" : "v", - "access" : 1, - "parameters" : [ "archiveId", "recordName" ], - "descriptor" : "(ILjava/lang/String;I)I" - }, { - "method" : "loadArchive", - "owner" : "ir", - "name" : "z", - "access" : 0, - "descriptor" : "(II)V" - }, { - "method" : "setIndexReference", + "method" : "decodeIndex", "owner" : "ir", "name" : "m", "access" : 0, "descriptor" : "([BB)V" }, { - "method" : "takeRecord", + "method" : "getFile", + "owner" : "ir", + "name" : "d", + "access" : 1, + "parameters" : [ "group", "file" ], + "descriptor" : "(III)[B" + }, { + "method" : "getFileFlat", + "owner" : "ir", + "name" : "a", + "access" : 1, + "parameters" : [ "groupOrFile" ], + "descriptor" : "(IB)[B" + }, { + "method" : "getFileId", + "owner" : "ir", + "name" : "v", + "access" : 1, + "parameters" : [ "group", "fileName" ], + "descriptor" : "(ILjava/lang/String;I)I" + }, { + "method" : "getGroupId", + "owner" : "ir", + "name" : "p", + "access" : 1, + "parameters" : [ "groupName" ], + "descriptor" : "(Ljava/lang/String;I)I" + }, { + "method" : "groupLoadPercent", + "owner" : "ir", + "name" : "e", + "access" : 0, + "descriptor" : "(II)I" + }, { + "method" : "groupLoadPercentByName", + "owner" : "ir", + "name" : "ac", + "access" : 1, + "parameters" : [ "groupName" ], + "descriptor" : "(Ljava/lang/String;I)I" + }, { + "method" : "loadGroup", + "owner" : "ir", + "name" : "z", + "access" : 0, + "descriptor" : "(II)V" + }, { + "method" : "takeFile", "owner" : "ir", "name" : "q", "access" : 1, - "parameters" : [ "archive", "record" ], + "parameters" : [ "group", "file" ], "descriptor" : "(III)[B" }, { - "method" : "takeRecordByNames", + "method" : "takeFileByNames", "owner" : "ir", "name" : "aq", "access" : 1, - "parameters" : [ "archiveName", "recordName" ], + "parameters" : [ "groupName", "fileName" ], "descriptor" : "(Ljava/lang/String;Ljava/lang/String;S)[B" }, { - "method" : "takeRecordEncrypted", + "method" : "takeFileEncrypted", "owner" : "ir", "name" : "w", "access" : 1, - "parameters" : [ "archive", "record", "xteaKey" ], + "parameters" : [ "group", "file", "xteaKey" ], "descriptor" : "(II[II)[B" }, { - "method" : "takeRecordFlat", + "method" : "takeFileFlat", "owner" : "ir", "name" : "x", "access" : 1, - "parameters" : [ "archiveOrRecord" ], + "parameters" : [ "groupOrFile" ], "descriptor" : "(IS)[B" }, { - "method" : "tryLoadArchive", - "owner" : "ir", - "name" : "g", - "access" : 1, - "parameters" : [ "archive" ], - "descriptor" : "(II)Z" - }, { - "method" : "tryLoadArchiveByName", - "owner" : "ir", - "name" : "av", - "access" : 1, - "parameters" : [ "archiveName" ], - "descriptor" : "(Ljava/lang/String;I)Z" - }, { - "method" : "tryLoadRecord", + "method" : "tryLoadFile", "owner" : "ir", "name" : "o", "access" : 1, - "parameters" : [ "archive", "record" ], + "parameters" : [ "group", "file" ], "descriptor" : "(III)Z" }, { - "method" : "tryLoadRecordByNames", + "method" : "tryLoadFileByNames", "owner" : "ir", "name" : "aj", "access" : 1, - "parameters" : [ "archiveName", "recordName" ], + "parameters" : [ "groupName", "fileName" ], "descriptor" : "(Ljava/lang/String;Ljava/lang/String;I)Z" + }, { + "method" : "tryLoadGroup", + "owner" : "ir", + "name" : "g", + "access" : 1, + "parameters" : [ "group" ], + "descriptor" : "(II)Z" + }, { + "method" : "tryLoadGroupByName", + "owner" : "ir", + "name" : "av", + "access" : 1, + "parameters" : [ "groupName" ], + "descriptor" : "(Ljava/lang/String;I)Z" }, { "method" : "__f_392", "owner" : "ir", @@ -16861,7 +16880,7 @@ "descriptor" : "(ZZ)V" } ] }, { - "class" : "IndexStoreActionHandler", + "class" : "ArchiveDiskActionHandler", "name" : "iv", "super" : "java.lang.Object", "access" : 33, @@ -16880,12 +16899,18 @@ "descriptor" : "()V" } ] }, { - "class" : "IndexCache", + "class" : "Archive", "name" : "it", "super" : "ir", "access" : 33, "interfaces" : [ ], "fields" : [ { + "field" : "archiveDisk", + "owner" : "it", + "name" : "c", + "access" : 0, + "descriptor" : "Lff;" + }, { "field" : "index", "owner" : "it", "name" : "p", @@ -16893,33 +16918,27 @@ "descriptor" : "I", "decoder" : -1579549759 }, { - "field" : "indexReferenceCrc", + "field" : "indexCrc", "owner" : "it", "name" : "av", "access" : 0, "descriptor" : "I", "decoder" : 1472870917 }, { - "field" : "indexReferenceVersion", + "field" : "indexVersion", "owner" : "it", "name" : "ar", "access" : 0, "descriptor" : "I", "decoder" : -785528219 }, { - "field" : "indexStore", - "owner" : "it", - "name" : "c", - "access" : 0, - "descriptor" : "Lff;" - }, { - "field" : "referenceStore", + "field" : "masterDisk", "owner" : "it", "name" : "r", "access" : 0, "descriptor" : "Lff;" }, { - "field" : "validArchives", + "field" : "validGroups", "owner" : "it", "name" : "aq", "access" : 64, @@ -16945,7 +16964,7 @@ "descriptor" : "Z" } ], "methods" : [ { - "method" : "archiveLoadPercent", + "method" : "groupLoadPercent", "owner" : "it", "name" : "e", "access" : 0, @@ -16964,13 +16983,13 @@ "parameters" : [ ], "descriptor" : "(I)V" }, { - "method" : "loadArchive", + "method" : "loadGroup", "owner" : "it", "name" : "z", "access" : 0, "descriptor" : "(II)V" }, { - "method" : "loadIndexReference", + "method" : "loadIndex", "owner" : "it", "name" : "co", "access" : 1, @@ -17141,6 +17160,20 @@ "decoder" : -1579051565 } ], "methods" : [ { + "method" : "decode", + "owner" : "ic", + "name" : "f", + "access" : 1, + "parameters" : [ "buffer" ], + "descriptor" : "(Lgr;B)V" + }, { + "method" : "decode0", + "owner" : "ic", + "name" : "q", + "access" : 0, + "parameters" : [ "buffer", "opcode" ], + "descriptor" : "(Lgr;II)V" + }, { "method" : "getSprite", "owner" : "ic", "name" : "o", @@ -17154,20 +17187,6 @@ "access" : 0, "parameters" : [ "id" ], "descriptor" : "(IB)Lln;" - }, { - "method" : "read", - "owner" : "ic", - "name" : "f", - "access" : 1, - "parameters" : [ "buffer" ], - "descriptor" : "(Lgr;B)V" - }, { - "method" : "readNext", - "owner" : "ic", - "name" : "q", - "access" : 0, - "parameters" : [ "buffer", "opcode" ], - "descriptor" : "(Lgr;II)V" }, { "method" : "__w_409", "owner" : "ic", @@ -17226,26 +17245,19 @@ "access" : 33, "interfaces" : [ ], "fields" : [ { - "field" : "archive", - "owner" : "io", - "name" : "u", - "access" : 0, - "descriptor" : "I", - "decoder" : -2065492247 - }, { - "field" : "heightScale", - "owner" : "io", - "name" : "n", - "access" : 0, - "descriptor" : "I", - "decoder" : 1199960995 - }, { "field" : "id", "owner" : "io", "name" : "o", "access" : 0, "descriptor" : "I", "decoder" : -713866165 + }, { + "field" : "model", + "owner" : "io", + "name" : "u", + "access" : 0, + "descriptor" : "I", + "decoder" : -2065492247 }, { "field" : "orientation", "owner" : "io", @@ -17254,29 +17266,43 @@ "descriptor" : "I", "decoder" : 1650590363 }, { - "field" : "recolorFrom", - "owner" : "io", - "name" : "l", - "access" : 0, - "descriptor" : "[S" - }, { - "field" : "recolorTo", + "field" : "recol_d", "owner" : "io", "name" : "e", "access" : 0, "descriptor" : "[S" }, { - "field" : "retextureFrom", + "field" : "recol_s", "owner" : "io", - "name" : "x", + "name" : "l", "access" : 0, "descriptor" : "[S" }, { - "field" : "retextureTo", + "field" : "resizeh", + "owner" : "io", + "name" : "k", + "access" : 0, + "descriptor" : "I", + "decoder" : 680796997 + }, { + "field" : "resizev", + "owner" : "io", + "name" : "n", + "access" : 0, + "descriptor" : "I", + "decoder" : 1199960995 + }, { + "field" : "retex_d", "owner" : "io", "name" : "d", "access" : 0, "descriptor" : "[S" + }, { + "field" : "retex_s", + "owner" : "io", + "name" : "x", + "access" : 0, + "descriptor" : "[S" }, { "field" : "sequence", "owner" : "io", @@ -17284,13 +17310,6 @@ "access" : 1, "descriptor" : "I", "decoder" : 1580078789 - }, { - "field" : "widthScale", - "owner" : "io", - "name" : "k", - "access" : 0, - "descriptor" : "I", - "decoder" : 680796997 }, { "field" : "__a", "owner" : "io", @@ -17307,25 +17326,25 @@ "decoder" : 1866148625 } ], "methods" : [ { - "method" : "getModel", - "owner" : "io", - "name" : "w", - "access" : 17, - "descriptor" : "(II)Ldu;" - }, { - "method" : "read", + "method" : "decode", "owner" : "io", "name" : "f", "access" : 0, "parameters" : [ "buffer" ], "descriptor" : "(Lgr;I)V" }, { - "method" : "readNext", + "method" : "decode0", "owner" : "io", "name" : "q", "access" : 0, "parameters" : [ "buffer", "n" ], "descriptor" : "(Lgr;II)V" + }, { + "method" : "getModel", + "owner" : "io", + "name" : "w", + "access" : 17, + "descriptor" : "(II)Ldu;" } ], "constructors" : [ { "access" : 0, @@ -17338,63 +17357,63 @@ "access" : 33, "interfaces" : [ ], "fields" : [ { - "field" : "archives", + "field" : "bodyPart", + "owner" : "im", + "name" : "o", + "access" : 1, + "descriptor" : "I", + "decoder" : 1619779051 + }, { + "field" : "models", "owner" : "im", "name" : "d", "access" : 0, "descriptor" : "[I" }, { - "field" : "recolorFrom", + "field" : "models2", "owner" : "im", - "name" : "g", + "name" : "u", "access" : 0, - "descriptor" : "[S" + "descriptor" : "[I" }, { - "field" : "recolorTo", + "field" : "recol_d", "owner" : "im", "name" : "l", "access" : 0, "descriptor" : "[S" }, { - "field" : "retextureFrom", + "field" : "recol_s", "owner" : "im", - "name" : "e", + "name" : "g", "access" : 0, "descriptor" : "[S" }, { - "field" : "retextureTo", + "field" : "retex_d", "owner" : "im", "name" : "x", "access" : 0, "descriptor" : "[S" }, { - "field" : "__u", + "field" : "retex_s", "owner" : "im", - "name" : "u", + "name" : "e", "access" : 0, - "descriptor" : "[I" + "descriptor" : "[S" }, { "field" : "__k", "owner" : "im", "name" : "k", "access" : 1, "descriptor" : "Z" - }, { - "field" : "__o", - "owner" : "im", - "name" : "o", - "access" : 1, - "descriptor" : "I", - "decoder" : 1619779051 } ], "methods" : [ { - "method" : "read", + "method" : "decode", "owner" : "im", "name" : "f", "access" : 0, "descriptor" : "(Lgr;S)V" }, { - "method" : "readNext", + "method" : "decode0", "owner" : "im", "name" : "q", "access" : 0, @@ -17510,6 +17529,18 @@ "decoder" : 1515955705 } ], "methods" : [ { + "method" : "decode", + "owner" : "ii", + "name" : "m", + "access" : 1, + "descriptor" : "(Lgr;I)V" + }, { + "method" : "decode0", + "owner" : "ii", + "name" : "f", + "access" : 0, + "descriptor" : "(Lgr;IB)V" + }, { "method" : "getSprite1", "owner" : "ii", "name" : "q", @@ -17523,25 +17554,13 @@ "access" : 1, "parameters" : [ ], "descriptor" : "(B)Lln;" - }, { - "method" : "read", - "owner" : "ii", - "name" : "m", - "access" : 1, - "descriptor" : "(Lgr;I)V" - }, { - "method" : "readNext", - "owner" : "ii", - "name" : "f", - "access" : 0, - "descriptor" : "(Lgr;IB)V" } ], "constructors" : [ { "access" : 1, "descriptor" : "()V" } ] }, { - "class" : "HitSplatDefinition", + "class" : "HitmarkDefinition", "name" : "jm", "super" : "fn", "access" : 33, @@ -17658,6 +17677,18 @@ "decoder" : 1751286975 } ], "methods" : [ { + "method" : "decode", + "owner" : "jm", + "name" : "q", + "access" : 0, + "descriptor" : "(Lgr;I)V" + }, { + "method" : "decode0", + "owner" : "jm", + "name" : "w", + "access" : 0, + "descriptor" : "(Lgr;II)V" + }, { "method" : "getFont", "owner" : "jm", "name" : "d", @@ -17671,18 +17702,6 @@ "access" : 1, "parameters" : [ "n" ], "descriptor" : "(IS)Ljava/lang/String;" - }, { - "method" : "read", - "owner" : "jm", - "name" : "q", - "access" : 0, - "descriptor" : "(Lgr;I)V" - }, { - "method" : "readNext", - "owner" : "jm", - "name" : "w", - "access" : 0, - "descriptor" : "(Lgr;II)V" }, { "method" : "transform", "owner" : "jm", @@ -17730,12 +17749,6 @@ "access" : 33, "interfaces" : [ ], "fields" : [ { - "field" : "actions", - "owner" : "jr", - "name" : "aj", - "access" : 1, - "descriptor" : "[Ljava/lang/String;" - }, { "field" : "ambient", "owner" : "jr", "name" : "ag", @@ -17930,6 +17943,12 @@ "access" : 0, "descriptor" : "I", "decoder" : 818611483 + }, { + "field" : "op", + "owner" : "jr", + "name" : "aj", + "access" : 1, + "descriptor" : "[Ljava/lang/String;" }, { "field" : "params", "owner" : "jr", @@ -17937,29 +17956,29 @@ "access" : 0, "descriptor" : "Llh;" }, { - "field" : "recolorFrom", - "owner" : "jr", - "name" : "n", - "access" : 0, - "descriptor" : "[S" - }, { - "field" : "recolorTo", + "field" : "recol_d", "owner" : "jr", "name" : "i", "access" : 0, "descriptor" : "[S" }, { - "field" : "retextureFrom", + "field" : "recol_s", "owner" : "jr", - "name" : "a", + "name" : "n", "access" : 0, "descriptor" : "[S" }, { - "field" : "retextureTo", + "field" : "retex_d", "owner" : "jr", "name" : "z", "access" : 0, "descriptor" : "[S" + }, { + "field" : "retex_s", + "owner" : "jr", + "name" : "a", + "access" : 0, + "descriptor" : "[S" }, { "field" : "sizeX", "owner" : "jr", @@ -17974,13 +17993,6 @@ "access" : 1, "descriptor" : "I", "decoder" : -301273619 - }, { - "field" : "transformConfigId", - "owner" : "jr", - "name" : "an", - "access" : 0, - "descriptor" : "I", - "decoder" : -2119965579 }, { "field" : "transformVarbit", "owner" : "jr", @@ -17988,6 +18000,13 @@ "access" : 0, "descriptor" : "I", "decoder" : 1136644531 + }, { + "field" : "transformVarp", + "owner" : "jr", + "name" : "an", + "access" : 0, + "descriptor" : "I", + "decoder" : -2119965579 }, { "field" : "transforms", "owner" : "jr", @@ -18014,6 +18033,18 @@ "descriptor" : "[I" } ], "methods" : [ { + "method" : "decode", + "owner" : "jr", + "name" : "w", + "access" : 0, + "descriptor" : "(Lgr;I)V" + }, { + "method" : "decode0", + "owner" : "jr", + "name" : "o", + "access" : 0, + "descriptor" : "(Lgr;II)V" + }, { "method" : "getIntParam", "owner" : "jr", "name" : "z", @@ -18045,24 +18076,12 @@ "access" : 1, "descriptor" : "(ILjava/lang/String;I)Ljava/lang/String;" }, { - "method" : "init", + "method" : "postDecode", "owner" : "jr", "name" : "q", "access" : 0, "parameters" : [ ], "descriptor" : "(I)V" - }, { - "method" : "read", - "owner" : "jr", - "name" : "w", - "access" : 0, - "descriptor" : "(Lgr;I)V" - }, { - "method" : "readNext", - "owner" : "jr", - "name" : "o", - "access" : 0, - "descriptor" : "(Lgr;II)V" }, { "method" : "transform", "owner" : "jr", @@ -18116,6 +18135,34 @@ "access" : 1, "descriptor" : "I", "decoder" : 738319589 + }, { + "field" : "boughtlink", + "owner" : "jv", + "name" : "bk", + "access" : 0, + "descriptor" : "I", + "decoder" : 700576005 + }, { + "field" : "boughttemplate", + "owner" : "jv", + "name" : "bd", + "access" : 0, + "descriptor" : "I", + "decoder" : -1969719185 + }, { + "field" : "certlink", + "owner" : "jv", + "name" : "ao", + "access" : 1, + "descriptor" : "I", + "decoder" : 619422509 + }, { + "field" : "certtemplate", + "owner" : "jv", + "name" : "aa", + "access" : 1, + "descriptor" : "I", + "decoder" : -2121346423 }, { "field" : "contrast", "owner" : "jv", @@ -18124,53 +18171,24 @@ "descriptor" : "I", "decoder" : -1984887305 }, { - "field" : "femaleHeadModel", + "field" : "cost", "owner" : "jv", - "name" : "am", - "access" : 0, - "descriptor" : "I", - "decoder" : 1709659237 - }, { - "field" : "femaleHeadModel2", - "owner" : "jv", - "name" : "an", - "access" : 0, - "descriptor" : "I", - "decoder" : 106668727 - }, { - "field" : "femaleModel", - "owner" : "jv", - "name" : "al", - "access" : 0, - "descriptor" : "I", - "decoder" : 886682223 - }, { - "field" : "femaleModel1", - "owner" : "jv", - "name" : "ab", - "access" : 0, - "descriptor" : "I", - "decoder" : 154223105 - }, { - "field" : "femaleModel2", - "owner" : "jv", - "name" : "ad", - "access" : 0, - "descriptor" : "I", - "decoder" : -771136925 - }, { - "field" : "femaleOffset", - "owner" : "jv", - "name" : "ae", - "access" : 0, - "descriptor" : "I", - "decoder" : -1619361485 - }, { - "field" : "groundActions", - "owner" : "jv", - "name" : "av", + "name" : "aq", "access" : 1, - "descriptor" : "[Ljava/lang/String;" + "descriptor" : "I", + "decoder" : -343501105 + }, { + "field" : "countco", + "owner" : "jv", + "name" : "au", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "countobj", + "owner" : "jv", + "name" : "az", + "access" : 0, + "descriptor" : "[I" }, { "field" : "id", "owner" : "jv", @@ -18179,79 +18197,66 @@ "descriptor" : "I", "decoder" : -590103687 }, { - "field" : "int1", - "owner" : "jv", - "name" : "bs", - "access" : 1, - "descriptor" : "I", - "decoder" : -1057008657 - }, { - "field" : "inventoryActions", + "field" : "iop", "owner" : "jv", "name" : "ar", "access" : 1, "descriptor" : "[Ljava/lang/String;" }, { - "field" : "isMembersOnly", - "owner" : "jv", - "name" : "aj", - "access" : 1, - "descriptor" : "Z" - }, { - "field" : "isStackable", - "owner" : "jv", - "name" : "ag", - "access" : 1, - "descriptor" : "I", - "decoder" : -237597001 - }, { - "field" : "isTradable", - "owner" : "jv", - "name" : "bn", - "access" : 1, - "descriptor" : "Z" - }, { - "field" : "maleHeadModel", + "field" : "manhead", "owner" : "jv", "name" : "ap", "access" : 0, "descriptor" : "I", "decoder" : -650184697 }, { - "field" : "maleHeadModel2", + "field" : "manhead2", "owner" : "jv", "name" : "as", "access" : 0, "descriptor" : "I", "decoder" : 548044049 }, { - "field" : "maleModel", + "field" : "manwear", "owner" : "jv", "name" : "ah", "access" : 0, "descriptor" : "I", "decoder" : 939367983 }, { - "field" : "maleModel1", + "field" : "manwear2", "owner" : "jv", "name" : "ak", "access" : 0, "descriptor" : "I", "decoder" : 140643039 }, { - "field" : "maleModel2", + "field" : "manwear3", "owner" : "jv", "name" : "at", "access" : 0, "descriptor" : "I", "decoder" : -691559863 }, { - "field" : "maleOffset", + "field" : "manwearyoff", "owner" : "jv", "name" : "aw", "access" : 0, "descriptor" : "I", "decoder" : -1378899027 + }, { + "field" : "members", + "owner" : "jv", + "name" : "aj", + "access" : 1, + "descriptor" : "Z" + }, { + "field" : "model", + "owner" : "jv", + "name" : "a", + "access" : 0, + "descriptor" : "I", + "decoder" : 1070080857 }, { "field" : "name", "owner" : "jv", @@ -18259,40 +18264,11 @@ "access" : 1, "descriptor" : "Ljava/lang/String;" }, { - "field" : "note", + "field" : "op", "owner" : "jv", - "name" : "ao", + "name" : "av", "access" : 1, - "descriptor" : "I", - "decoder" : 619422509 - }, { - "field" : "noteTemplate", - "owner" : "jv", - "name" : "aa", - "access" : 1, - "descriptor" : "I", - "decoder" : -2121346423 - }, { - "field" : "notedId", - "owner" : "jv", - "name" : "bd", - "access" : 0, - "descriptor" : "I", - "decoder" : -1969719185 - }, { - "field" : "offsetX2d", - "owner" : "jv", - "name" : "p", - "access" : 1, - "descriptor" : "I", - "decoder" : -533708435 - }, { - "field" : "offsetY2d", - "owner" : "jv", - "name" : "v", - "access" : 1, - "descriptor" : "I", - "decoder" : -2130350563 + "descriptor" : "[Ljava/lang/String;" }, { "field" : "params", "owner" : "jv", @@ -18300,85 +18276,133 @@ "access" : 0, "descriptor" : "Llh;" }, { - "field" : "placeholder", + "field" : "placeholderlink", "owner" : "jv", "name" : "bc", "access" : 1, "descriptor" : "I", "decoder" : 807815565 }, { - "field" : "placeholderTemplate", + "field" : "placeholdertemplate", "owner" : "jv", "name" : "bo", "access" : 1, "descriptor" : "I", "decoder" : -1854342455 }, { - "field" : "price", - "owner" : "jv", - "name" : "aq", - "access" : 1, - "descriptor" : "I", - "decoder" : -343501105 - }, { - "field" : "recolorFrom", - "owner" : "jv", - "name" : "j", - "access" : 0, - "descriptor" : "[S" - }, { - "field" : "recolorTo", + "field" : "recol_d", "owner" : "jv", "name" : "s", "access" : 0, "descriptor" : "[S" }, { - "field" : "resizeX", + "field" : "recol_s", + "owner" : "jv", + "name" : "j", + "access" : 0, + "descriptor" : "[S" + }, { + "field" : "resizex", "owner" : "jv", "name" : "ax", "access" : 0, "descriptor" : "I", "decoder" : 69034859 }, { - "field" : "resizeY", + "field" : "resizey", "owner" : "jv", "name" : "af", "access" : 0, "descriptor" : "I", "decoder" : -17174497 }, { - "field" : "resizeZ", + "field" : "resizez", "owner" : "jv", "name" : "ai", "access" : 0, "descriptor" : "I", "decoder" : 1395132907 }, { - "field" : "retextureFrom", - "owner" : "jv", - "name" : "t", - "access" : 0, - "descriptor" : "[S" - }, { - "field" : "retextureTo", + "field" : "retex_d", "owner" : "jv", "name" : "y", "access" : 0, "descriptor" : "[S" }, { - "field" : "shiftClickIndex0", + "field" : "retex_s", + "owner" : "jv", + "name" : "t", + "access" : 0, + "descriptor" : "[S" + }, { + "field" : "shiftclickindex", "owner" : "jv", "name" : "ay", "access" : 0, "descriptor" : "I", "decoder" : 881309855 }, { - "field" : "unnotedId", + "field" : "stackable", "owner" : "jv", - "name" : "bk", + "name" : "ag", + "access" : 1, + "descriptor" : "I", + "decoder" : -237597001 + }, { + "field" : "stockmarket", + "owner" : "jv", + "name" : "bn", + "access" : 1, + "descriptor" : "Z" + }, { + "field" : "team", + "owner" : "jv", + "name" : "bs", + "access" : 1, + "descriptor" : "I", + "decoder" : -1057008657 + }, { + "field" : "womanhead", + "owner" : "jv", + "name" : "am", "access" : 0, "descriptor" : "I", - "decoder" : 700576005 + "decoder" : 1709659237 + }, { + "field" : "womanhead2", + "owner" : "jv", + "name" : "an", + "access" : 0, + "descriptor" : "I", + "decoder" : 106668727 + }, { + "field" : "womanwear", + "owner" : "jv", + "name" : "al", + "access" : 0, + "descriptor" : "I", + "decoder" : 886682223 + }, { + "field" : "womanwear2", + "owner" : "jv", + "name" : "ab", + "access" : 0, + "descriptor" : "I", + "decoder" : 154223105 + }, { + "field" : "womanwear3", + "owner" : "jv", + "name" : "ad", + "access" : 0, + "descriptor" : "I", + "decoder" : -771136925 + }, { + "field" : "womanwearyoff", + "owner" : "jv", + "name" : "ae", + "access" : 0, + "descriptor" : "I", + "decoder" : -1619361485 }, { "field" : "xan2d", "owner" : "jv", @@ -18386,6 +18410,13 @@ "access" : 1, "descriptor" : "I", "decoder" : 880150839 + }, { + "field" : "xof2d", + "owner" : "jv", + "name" : "p", + "access" : 1, + "descriptor" : "I", + "decoder" : -533708435 }, { "field" : "yan2d", "owner" : "jv", @@ -18393,6 +18424,13 @@ "access" : 1, "descriptor" : "I", "decoder" : 507808107 + }, { + "field" : "yof2d", + "owner" : "jv", + "name" : "v", + "access" : 1, + "descriptor" : "I", + "decoder" : -2130350563 }, { "field" : "zan2d", "owner" : "jv", @@ -18407,27 +18445,48 @@ "access" : 1, "descriptor" : "I", "decoder" : 278037959 - }, { - "field" : "__a", - "owner" : "jv", - "name" : "a", - "access" : 0, - "descriptor" : "I", - "decoder" : 1070080857 - }, { - "field" : "__au", - "owner" : "jv", - "name" : "au", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__az", - "owner" : "jv", - "name" : "az", - "access" : 0, - "descriptor" : "[I" } ], "methods" : [ { + "method" : "decode", + "owner" : "jv", + "name" : "q", + "access" : 0, + "descriptor" : "(Lgr;I)V" + }, { + "method" : "decode0", + "owner" : "jv", + "name" : "w", + "access" : 0, + "descriptor" : "(Lgr;II)V" + }, { + "method" : "genBought", + "owner" : "jv", + "name" : "u", + "access" : 0, + "parameters" : [ "template", "link" ], + "descriptor" : "(Ljv;Ljv;I)V" + }, { + "method" : "genCert", + "owner" : "jv", + "name" : "o", + "access" : 0, + "parameters" : [ "template", "link" ], + "descriptor" : "(Ljv;Ljv;I)V" + }, { + "method" : "genPlaceholder", + "owner" : "jv", + "name" : "g", + "access" : 0, + "parameters" : [ "template", "link" ], + "descriptor" : "(Ljv;Ljv;I)V" + }, { + "method" : "getCountObj", + "owner" : "jv", + "name" : "x", + "access" : 1, + "parameters" : [ "quantity" ], + "descriptor" : "(IB)Ljv;" + }, { "method" : "getIntParam", "owner" : "jv", "name" : "y", @@ -18453,18 +18512,6 @@ "name" : "h", "access" : 1, "descriptor" : "(ILjava/lang/String;I)Ljava/lang/String;" - }, { - "method" : "read", - "owner" : "jv", - "name" : "q", - "access" : 0, - "descriptor" : "(Lgr;I)V" - }, { - "method" : "readNext", - "owner" : "jv", - "name" : "w", - "access" : 0, - "descriptor" : "(Lgr;II)V" }, { "method" : "__f_425", "owner" : "jv", @@ -18473,63 +18520,35 @@ "parameters" : [ ], "descriptor" : "(I)V" }, { - "method" : "__o_426", - "owner" : "jv", - "name" : "o", - "access" : 0, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Ljv;Ljv;I)V" - }, { - "method" : "__u_427", - "owner" : "jv", - "name" : "u", - "access" : 0, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Ljv;Ljv;I)V" - }, { - "method" : "__g_428", - "owner" : "jv", - "name" : "g", - "access" : 0, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Ljv;Ljv;I)V" - }, { - "method" : "__l_429", + "method" : "__l_426", "owner" : "jv", "name" : "l", "access" : 17, "parameters" : [ "arg0" ], "descriptor" : "(II)Ldw;" }, { - "method" : "__x_430", - "owner" : "jv", - "name" : "x", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(IB)Ljv;" - }, { - "method" : "__z_431", + "method" : "__z_427", "owner" : "jv", "name" : "z", "access" : 17, "parameters" : [ "arg0" ], "descriptor" : "(ZI)Z" }, { - "method" : "__j_432", + "method" : "__j_428", "owner" : "jv", "name" : "j", "access" : 17, "parameters" : [ "arg0" ], "descriptor" : "(ZB)Ldw;" }, { - "method" : "__s_433", + "method" : "__s_429", "owner" : "jv", "name" : "s", "access" : 17, "parameters" : [ "arg0" ], "descriptor" : "(ZI)Z" }, { - "method" : "__t_434", + "method" : "__t_430", "owner" : "jv", "name" : "t", "access" : 17, @@ -18547,18 +18566,6 @@ "access" : 33, "interfaces" : [ ], "fields" : [ { - "field" : "actions", - "owner" : "jz", - "name" : "h", - "access" : 1, - "descriptor" : "[Ljava/lang/String;" - }, { - "field" : "archives", - "owner" : "jz", - "name" : "l", - "access" : 0, - "descriptor" : "[I" - }, { "field" : "combatLevel", "owner" : "jz", "name" : "c", @@ -18578,13 +18585,6 @@ "access" : 1, "descriptor" : "I", "decoder" : 235824283 - }, { - "field" : "heightScale", - "owner" : "jz", - "name" : "p", - "access" : 0, - "descriptor" : "I", - "decoder" : 1390683537 }, { "field" : "id", "owner" : "jz", @@ -18592,13 +18592,6 @@ "access" : 1, "descriptor" : "I", "decoder" : -1937346627 - }, { - "field" : "idleSequence", - "owner" : "jz", - "name" : "x", - "access" : 1, - "descriptor" : "I", - "decoder" : 275200787 }, { "field" : "isFollower", "owner" : "jz", @@ -18611,12 +18604,24 @@ "name" : "ah", "access" : 1, "descriptor" : "Z" + }, { + "field" : "models", + "owner" : "jz", + "name" : "l", + "access" : 0, + "descriptor" : "[I" }, { "field" : "name", "owner" : "jz", "name" : "u", "access" : 1, "descriptor" : "Ljava/lang/String;" + }, { + "field" : "op", + "owner" : "jz", + "name" : "h", + "access" : 1, + "descriptor" : "[Ljava/lang/String;" }, { "field" : "params", "owner" : "jz", @@ -18624,29 +18629,50 @@ "access" : 0, "descriptor" : "Llh;" }, { - "field" : "recolorFrom", + "field" : "readyanim", "owner" : "jz", - "name" : "j", - "access" : 0, - "descriptor" : "[S" + "name" : "x", + "access" : 1, + "descriptor" : "I", + "decoder" : 275200787 }, { - "field" : "recolorTo", + "field" : "recol_d", "owner" : "jz", "name" : "s", "access" : 0, "descriptor" : "[S" }, { - "field" : "retextureFrom", + "field" : "recol_s", "owner" : "jz", - "name" : "t", + "name" : "j", "access" : 0, "descriptor" : "[S" }, { - "field" : "retextureTo", + "field" : "resizeh", + "owner" : "jz", + "name" : "r", + "access" : 0, + "descriptor" : "I", + "decoder" : -1469219067 + }, { + "field" : "resizev", + "owner" : "jz", + "name" : "p", + "access" : 0, + "descriptor" : "I", + "decoder" : 1390683537 + }, { + "field" : "retex_d", "owner" : "jz", "name" : "y", "access" : 0, "descriptor" : "[S" + }, { + "field" : "retex_s", + "owner" : "jz", + "name" : "t", + "access" : 0, + "descriptor" : "[S" }, { "field" : "size", "owner" : "jz", @@ -18675,54 +18701,47 @@ "access" : 1, "descriptor" : "[I" }, { - "field" : "turnLeftSequence", + "field" : "turnleftanim", "owner" : "jz", "name" : "d", "access" : 1, "descriptor" : "I", "decoder" : 819690597 }, { - "field" : "turnRightSequence", + "field" : "turnrightanim", "owner" : "jz", "name" : "k", "access" : 1, "descriptor" : "I", "decoder" : 1311553413 }, { - "field" : "walkSequence", + "field" : "walkanim", "owner" : "jz", "name" : "n", "access" : 1, "descriptor" : "I", "decoder" : -284110917 }, { - "field" : "walkTurnLeftSequence", - "owner" : "jz", - "name" : "a", - "access" : 1, - "descriptor" : "I", - "decoder" : -1213774321 - }, { - "field" : "walkTurnRightSequence", - "owner" : "jz", - "name" : "z", - "access" : 1, - "descriptor" : "I", - "decoder" : -96930503 - }, { - "field" : "walkTurnSequence", + "field" : "walkbackanim", "owner" : "jz", "name" : "i", "access" : 1, "descriptor" : "I", "decoder" : 1952230339 }, { - "field" : "widthScale", + "field" : "walkleftanim", "owner" : "jz", - "name" : "r", - "access" : 0, + "name" : "a", + "access" : 1, "descriptor" : "I", - "decoder" : -1469219067 + "decoder" : -1213774321 + }, { + "field" : "walkrightanim", + "owner" : "jz", + "name" : "z", + "access" : 1, + "descriptor" : "I", + "decoder" : -96930503 }, { "field" : "__ag", "owner" : "jz", @@ -18764,6 +18783,18 @@ "decoder" : -506638747 } ], "methods" : [ { + "method" : "decode", + "owner" : "jz", + "name" : "w", + "access" : 0, + "descriptor" : "(Lgr;I)V" + }, { + "method" : "decode0", + "owner" : "jz", + "name" : "o", + "access" : 0, + "descriptor" : "(Lgr;IB)V" + }, { "method" : "getIntParam", "owner" : "jz", "name" : "x", @@ -18790,24 +18821,12 @@ "access" : 1, "descriptor" : "(ILjava/lang/String;I)Ljava/lang/String;" }, { - "method" : "init", + "method" : "postDecode", "owner" : "jz", "name" : "q", "access" : 0, "parameters" : [ ], "descriptor" : "(I)V" - }, { - "method" : "read", - "owner" : "jz", - "name" : "w", - "access" : 0, - "descriptor" : "(Lgr;I)V" - }, { - "method" : "readNext", - "owner" : "jz", - "name" : "o", - "access" : 0, - "descriptor" : "(Lgr;IB)V" }, { "method" : "transform", "owner" : "jz", @@ -18816,7 +18835,7 @@ "parameters" : [ ], "descriptor" : "(B)Ljz;" }, { - "method" : "__e_435", + "method" : "__e_431", "owner" : "jz", "name" : "e", "access" : 1, @@ -18828,7 +18847,7 @@ "descriptor" : "()V" } ] }, { - "class" : "OverlayDefinition", + "class" : "FloorOverlayDefinition", "name" : "jf", "super" : "fn", "access" : 33, @@ -18904,24 +18923,24 @@ "descriptor" : "Z" } ], "methods" : [ { - "method" : "init", - "owner" : "jf", - "name" : "f", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "read", + "method" : "decode", "owner" : "jf", "name" : "q", "access" : 1, "descriptor" : "(Lgr;II)V" }, { - "method" : "readNext", + "method" : "decode0", "owner" : "jf", "name" : "w", "access" : 0, "descriptor" : "(Lgr;III)V" + }, { + "method" : "postDecode", + "owner" : "jf", + "name" : "f", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)V" }, { "method" : "setHsl", "owner" : "jf", @@ -19034,6 +19053,13 @@ "descriptor" : "[I" } ], "methods" : [ { + "method" : "animateComponent", + "owner" : "jh", + "name" : "e", + "access" : 1, + "parameters" : [ "model", "frame" ], + "descriptor" : "(Ldu;II)Ldu;" + }, { "method" : "animateObject", "owner" : "jh", "name" : "u", @@ -19062,31 +19088,24 @@ "parameters" : [ "model", "frame" ], "descriptor" : "(Ldu;II)Ldu;" }, { - "method" : "animateWidget", - "owner" : "jh", - "name" : "e", - "access" : 1, - "parameters" : [ "model", "frame" ], - "descriptor" : "(Ldu;II)Ldu;" - }, { - "method" : "init", - "owner" : "jh", - "name" : "w", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(B)V" - }, { - "method" : "read", + "method" : "decode", "owner" : "jh", "name" : "f", "access" : 0, "descriptor" : "(Lgr;S)V" }, { - "method" : "readNext", + "method" : "decode0", "owner" : "jh", "name" : "q", "access" : 0, "descriptor" : "(Lgr;II)V" + }, { + "method" : "postDecode", + "owner" : "jh", + "name" : "w", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(B)V" } ], "constructors" : [ { "access" : 0, @@ -19160,7 +19179,7 @@ "parameters" : [ "node" ], "descriptor" : "(Lgw;)Lgw;" }, { - "method" : "__iterator_436", + "method" : "__iterator_432", "owner" : "ja", "name" : "iterator", "access" : 1, @@ -19191,21 +19210,21 @@ "descriptor" : "Lgh;" } ], "methods" : [ { - "method" : "__m_437", + "method" : "__m_433", "owner" : "jy", "name" : "m", "access" : 1, "parameters" : [ "arg0" ], "descriptor" : "(Lgh;)V" }, { - "method" : "__f_438", + "method" : "__f_434", "owner" : "jy", "name" : "f", "access" : 1, "parameters" : [ ], "descriptor" : "()Lgh;" }, { - "method" : "__q_439", + "method" : "__q_435", "owner" : "jy", "name" : "q", "access" : 1, @@ -19242,21 +19261,21 @@ "descriptor" : "Lfn;" } ], "methods" : [ { - "method" : "__next_440", + "method" : "__next_436", "owner" : "jl", "name" : "next", "access" : 1, "parameters" : [ ], "descriptor" : "()Ljava/lang/Object;" }, { - "method" : "__hasNext_441", + "method" : "__hasNext_437", "owner" : "jl", "name" : "hasNext", "access" : 1, "parameters" : [ ], "descriptor" : "()Z" }, { - "method" : "__remove_442", + "method" : "__remove_438", "owner" : "jl", "name" : "remove", "access" : 1, @@ -19293,35 +19312,35 @@ "descriptor" : "Lgw;" } ], "methods" : [ { - "method" : "__u_443", + "method" : "__u_439", "owner" : "jt", "name" : "u", "access" : 0, "parameters" : [ "arg0" ], "descriptor" : "(Lja;)V" }, { - "method" : "__g_444", + "method" : "__g_440", "owner" : "jt", "name" : "g", "access" : 0, "parameters" : [ ], "descriptor" : "()V" }, { - "method" : "__next_445", + "method" : "__next_441", "owner" : "jt", "name" : "next", "access" : 1, "parameters" : [ ], "descriptor" : "()Ljava/lang/Object;" }, { - "method" : "__hasNext_446", + "method" : "__hasNext_442", "owner" : "jt", "name" : "hasNext", "access" : 1, "parameters" : [ ], "descriptor" : "()Z" }, { - "method" : "__remove_447", + "method" : "__remove_443", "owner" : "jt", "name" : "remove", "access" : 1, @@ -19365,35 +19384,35 @@ "parameters" : [ ], "descriptor" : "()V" }, { - "method" : "__q_448", + "method" : "__q_444", "owner" : "jc", "name" : "q", "access" : 1, "parameters" : [ ], "descriptor" : "()Lfn;" }, { - "method" : "__w_449", + "method" : "__w_445", "owner" : "jc", "name" : "w", "access" : 1, "parameters" : [ ], "descriptor" : "()Lfn;" }, { - "method" : "__o_450", + "method" : "__o_446", "owner" : "jc", "name" : "o", "access" : 0, "parameters" : [ "arg0" ], "descriptor" : "(Lfn;)Lfn;" }, { - "method" : "__u_451", + "method" : "__u_447", "owner" : "jc", "name" : "u", "access" : 1, "parameters" : [ ], "descriptor" : "()Lfn;" }, { - "method" : "__iterator_452", + "method" : "__iterator_448", "owner" : "jc", "name" : "iterator", "access" : 1, @@ -19488,42 +19507,42 @@ "parameters" : [ "buffer" ], "descriptor" : "(Lgr;I)V" }, { - "method" : "__m_453", + "method" : "__m_449", "owner" : "jo", "name" : "m", "access" : 1, "parameters" : [ ], "descriptor" : "(I)V" }, { - "method" : "__f_454", + "method" : "__f_450", "owner" : "jo", "name" : "f", "access" : 1, "parameters" : [ ], "descriptor" : "(B)V" }, { - "method" : "__q_455", + "method" : "__q_451", "owner" : "jo", "name" : "q", "access" : 1, "parameters" : [ "arg0" ], "descriptor" : "(II)V" }, { - "method" : "__w_456", + "method" : "__w_452", "owner" : "jo", "name" : "w", "access" : 1, "parameters" : [ ], "descriptor" : "(I)V" }, { - "method" : "__o_457", + "method" : "__o_453", "owner" : "jo", "name" : "o", "access" : 1, "parameters" : [ ], "descriptor" : "(S)V" }, { - "method" : "__u_458", + "method" : "__u_454", "owner" : "jo", "name" : "u", "access" : 1, @@ -19589,7 +19608,7 @@ "parameters" : [ ], "descriptor" : "(I)Lkp;" }, { - "method" : "__compareTo_459", + "method" : "__compareTo_455", "owner" : "js", "name" : "compareTo", "access" : 1, @@ -19614,21 +19633,21 @@ "descriptor" : "Ljava/util/Comparator;" } ], "methods" : [ { - "method" : "__e_460", + "method" : "__e_456", "owner" : "kf", "name" : "e", "access" : 16, "parameters" : [ "arg0" ], "descriptor" : "(Ljava/util/Comparator;B)V" }, { - "method" : "__x_461", + "method" : "__x_457", "owner" : "kf", "name" : "x", "access" : 20, "parameters" : [ "arg0", "arg1" ], "descriptor" : "(Ljs;Ljs;I)I" }, { - "method" : "__equals_462", + "method" : "__equals_458", "owner" : "kf", "name" : "equals", "access" : 1, @@ -19661,14 +19680,14 @@ "parameters" : [ "other" ], "descriptor" : "(Lks;I)I" }, { - "method" : "__aj_463", + "method" : "__aj_459", "owner" : "ks", "name" : "aj", "access" : 1, "parameters" : [ "arg0" ], "descriptor" : "(Ljs;I)I" }, { - "method" : "__compareTo_464", + "method" : "__compareTo_460", "owner" : "ks", "name" : "compareTo", "access" : 1, @@ -19725,7 +19744,7 @@ "parameters" : [ "buffer", "n" ], "descriptor" : "(Lgr;IB)V" }, { - "method" : "__q_465", + "method" : "__q_461", "owner" : "kg", "name" : "q", "access" : 1, @@ -19777,28 +19796,28 @@ "parameters" : [ ], "descriptor" : "(I)Ljava/lang/String;" }, { - "method" : "__equals_466", + "method" : "__equals_462", "owner" : "kp", "name" : "equals", "access" : 1, "parameters" : [ "arg0" ], "descriptor" : "(Ljava/lang/Object;)Z" }, { - "method" : "__hashCode_467", + "method" : "__hashCode_463", "owner" : "kp", "name" : "hashCode", "access" : 1, "parameters" : [ ], "descriptor" : "()I" }, { - "method" : "__toString_468", + "method" : "__toString_464", "owner" : "kp", "name" : "toString", "access" : 1, "parameters" : [ ], "descriptor" : "()Ljava/lang/String;" }, { - "method" : "__compareTo_469", + "method" : "__compareTo_465", "owner" : "kp", "name" : "compareTo", "access" : 1, @@ -19836,14 +19855,14 @@ "parameters" : [ "other" ], "descriptor" : "(Lkq;I)I" }, { - "method" : "__aj_470", + "method" : "__aj_466", "owner" : "kq", "name" : "aj", "access" : 1, "parameters" : [ "arg0" ], "descriptor" : "(Ljs;I)I" }, { - "method" : "__compareTo_471", + "method" : "__compareTo_467", "owner" : "kq", "name" : "compareTo", "access" : 1, @@ -19872,6 +19891,12 @@ "name" : "f", "access" : 16, "descriptor" : "Llx;" + }, { + "field" : "minKick", + "owner" : "kv", + "name" : "k", + "access" : 1, + "descriptor" : "B" }, { "field" : "name", "owner" : "kv", @@ -19898,12 +19923,6 @@ "access" : 0, "descriptor" : "I", "decoder" : 386706253 - }, { - "field" : "__k", - "owner" : "kv", - "name" : "k", - "access" : 1, - "descriptor" : "B" } ], "methods" : [ { "method" : "clearFriends", @@ -19939,28 +19958,28 @@ "parameters" : [ "buffer" ], "descriptor" : "(Lgr;I)V" }, { - "method" : "__q_472", + "method" : "__q_468", "owner" : "kv", "name" : "q", "access" : 16, "parameters" : [ "arg0" ], "descriptor" : "(Ljava/lang/String;I)V" }, { - "method" : "__x_473", + "method" : "__x_469", "owner" : "kv", "name" : "x", "access" : 16, "parameters" : [ "arg0" ], "descriptor" : "(Ljava/lang/String;B)V" }, { - "method" : "__a_474", + "method" : "__a_470", "owner" : "kv", "name" : "a", "access" : 17, "parameters" : [ "arg0" ], "descriptor" : "(Lgr;B)V" }, { - "method" : "__cp_475", + "method" : "__cp_471", "owner" : "kv", "name" : "cp", "access" : 16, @@ -20026,7 +20045,7 @@ "descriptor" : "(Lir;Lir;)V" } ] }, { - "class" : "SpriteIds", + "class" : "GraphicsDefaults", "name" : "lg", "super" : "java.lang.Object", "access" : 33, @@ -20110,7 +20129,7 @@ "decoder" : 1673796151 } ], "methods" : [ { - "method" : "read", + "method" : "decode", "owner" : "lg", "name" : "m", "access" : 1, @@ -20135,21 +20154,21 @@ "descriptor" : "Z" } ], "methods" : [ { - "method" : "__m_476", + "method" : "__m_472", "owner" : "ly", "name" : "m", "access" : 0, "parameters" : [ "arg0", "arg1" ], "descriptor" : "(Ljs;Ljs;B)I" }, { - "method" : "__compare_477", + "method" : "__compare_473", "owner" : "ly", "name" : "compare", "access" : 1, "parameters" : [ "arg0", "arg1" ], "descriptor" : "(Ljava/lang/Object;Ljava/lang/Object;)I" }, { - "method" : "__equals_478", + "method" : "__equals_474", "owner" : "ly", "name" : "equals", "access" : 1, @@ -20174,21 +20193,21 @@ "descriptor" : "Z" } ], "methods" : [ { - "method" : "__m_479", + "method" : "__m_475", "owner" : "li", "name" : "m", "access" : 0, "parameters" : [ "arg0", "arg1" ], "descriptor" : "(Ljs;Ljs;I)I" }, { - "method" : "__compare_480", + "method" : "__compare_476", "owner" : "li", "name" : "compare", "access" : 1, "parameters" : [ "arg0", "arg1" ], "descriptor" : "(Ljava/lang/Object;Ljava/lang/Object;)I" }, { - "method" : "__equals_481", + "method" : "__equals_477", "owner" : "li", "name" : "equals", "access" : 1, @@ -20268,7 +20287,7 @@ "access" : 1, "descriptor" : "(Lgw;J)V" }, { - "method" : "__iterator_482", + "method" : "__iterator_478", "owner" : "lh", "name" : "iterator", "access" : 1, @@ -20311,28 +20330,28 @@ "descriptor" : "I" } ], "methods" : [ { - "method" : "__u_483", + "method" : "__u_479", "owner" : "lk", "name" : "u", "access" : 0, "parameters" : [ ], "descriptor" : "()V" }, { - "method" : "__next_484", + "method" : "__next_480", "owner" : "lk", "name" : "next", "access" : 1, "parameters" : [ ], "descriptor" : "()Ljava/lang/Object;" }, { - "method" : "__hasNext_485", + "method" : "__hasNext_481", "owner" : "lk", "name" : "hasNext", "access" : 1, "parameters" : [ ], "descriptor" : "()Z" }, { - "method" : "__remove_486", + "method" : "__remove_482", "owner" : "lk", "name" : "remove", "access" : 1, @@ -20379,56 +20398,56 @@ "decoder" : 1377856837 } ], "methods" : [ { - "method" : "__m_487", + "method" : "__m_483", "owner" : "la", "name" : "m", "access" : 1, "parameters" : [ "arg0", "arg1" ], "descriptor" : "(IIB)V" }, { - "method" : "__f_488", + "method" : "__f_484", "owner" : "la", "name" : "f", "access" : 1, "parameters" : [ "arg0", "arg1" ], "descriptor" : "(III)V" }, { - "method" : "__toString_489", + "method" : "__toString_485", "owner" : "la", "name" : "toString", "access" : 1, "parameters" : [ ], "descriptor" : "()Ljava/lang/String;" }, { - "method" : "__q_490", + "method" : "__q_486", "owner" : "la", "name" : "q", "access" : 1, "parameters" : [ "arg0", "arg1" ], "descriptor" : "(Lla;Lla;I)V" }, { - "method" : "__w_491", + "method" : "__w_487", "owner" : "la", "name" : "w", "access" : 0, "parameters" : [ "arg0", "arg1" ], "descriptor" : "(Lla;Lla;I)V" }, { - "method" : "__o_492", + "method" : "__o_488", "owner" : "la", "name" : "o", "access" : 0, "parameters" : [ "arg0", "arg1" ], "descriptor" : "(Lla;Lla;S)V" }, { - "method" : "__u_493", + "method" : "__u_489", "owner" : "la", "name" : "u", "access" : 0, "parameters" : [ ], "descriptor" : "(I)I" }, { - "method" : "__g_494", + "method" : "__g_490", "owner" : "la", "name" : "g", "access" : 0, @@ -20464,7 +20483,7 @@ "decoder" : -1204297807 } ], "methods" : [ { - "method" : "__f_495", + "method" : "__f_491", "owner" : "lj", "name" : "f", "access" : 1, @@ -20545,14 +20564,14 @@ "parameters" : [ "r", "g", "b" ], "descriptor" : "(III)V" }, { - "method" : "__q_496", + "method" : "__q_492", "owner" : "lq", "name" : "q", "access" : 1, "parameters" : [ "arg0", "arg1" ], "descriptor" : "(II)V" }, { - "method" : "__o_497", + "method" : "__o_493", "owner" : "lq", "name" : "o", "access" : 1, @@ -20634,140 +20653,140 @@ "parameters" : [ ], "descriptor" : "()V" }, { - "method" : "__q_498", + "method" : "__q_494", "owner" : "ln", "name" : "q", "access" : 1, "parameters" : [ ], "descriptor" : "()V" }, { - "method" : "__o_499", + "method" : "__o_495", "owner" : "ln", "name" : "o", "access" : 1, "parameters" : [ "arg0" ], "descriptor" : "(I)V" }, { - "method" : "__u_500", + "method" : "__u_496", "owner" : "ln", "name" : "u", "access" : 1, "parameters" : [ ], "descriptor" : "()V" }, { - "method" : "__g_501", + "method" : "__g_497", "owner" : "ln", "name" : "g", "access" : 1, "parameters" : [ ], "descriptor" : "()V" }, { - "method" : "__l_502", + "method" : "__l_498", "owner" : "ln", "name" : "l", "access" : 1, "parameters" : [ "arg0" ], "descriptor" : "(I)V" }, { - "method" : "__e_503", + "method" : "__e_499", "owner" : "ln", "name" : "e", "access" : 1, "parameters" : [ "arg0" ], "descriptor" : "(I)V" }, { - "method" : "__x_504", + "method" : "__x_500", "owner" : "ln", "name" : "x", "access" : 1, "parameters" : [ "arg0", "arg1" ], "descriptor" : "(II)V" }, { - "method" : "__a_505", + "method" : "__a_501", "owner" : "ln", "name" : "a", "access" : 1, "parameters" : [ "arg0", "arg1" ], "descriptor" : "(II)V" }, { - "method" : "__j_506", + "method" : "__j_502", "owner" : "ln", "name" : "j", "access" : 1, "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], "descriptor" : "(IIII)V" }, { - "method" : "__t_507", + "method" : "__t_503", "owner" : "ln", "name" : "t", "access" : 1, "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], "descriptor" : "(IIII)V" }, { - "method" : "__h_508", + "method" : "__h_504", "owner" : "ln", "name" : "h", "access" : 1, "parameters" : [ "arg0", "arg1", "arg2" ], "descriptor" : "(III)V" }, { - "method" : "__c_509", + "method" : "__c_505", "owner" : "ln", "name" : "c", "access" : 1, "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4" ], "descriptor" : "(IIIII)V" }, { - "method" : "__v_510", + "method" : "__v_506", "owner" : "ln", "name" : "v", "access" : 1, "parameters" : [ "arg0", "arg1", "arg2" ], "descriptor" : "(III)V" }, { - "method" : "__aj_511", + "method" : "__aj_507", "owner" : "ln", "name" : "aj", "access" : 1, "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4" ], "descriptor" : "(IIIII)V" }, { - "method" : "__ac_512", + "method" : "__ac_508", "owner" : "ln", "name" : "ac", "access" : 1, "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5", "arg6", "arg7" ], "descriptor" : "(IIIIII[I[I)V" }, { - "method" : "__ay_513", + "method" : "__ay_509", "owner" : "ln", "name" : "ay", "access" : 1, "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5", "arg6", "arg7", "arg8", "arg9" ], "descriptor" : "(IIIIIIII[I[I)V" }, { - "method" : "__ah_514", + "method" : "__ah_510", "owner" : "ln", "name" : "ah", "access" : 1, "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5", "arg6", "arg7" ], "descriptor" : "(IIIIIIDI)V" }, { - "method" : "__ak_515", + "method" : "__ak_511", "owner" : "ln", "name" : "ak", "access" : 1, "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], "descriptor" : "(IIII)V" }, { - "method" : "__aw_516", + "method" : "__aw_512", "owner" : "ln", "name" : "aw", "access" : 0, "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5" ], "descriptor" : "(IIIIII)V" }, { - "method" : "__al_517", + "method" : "__al_513", "owner" : "ln", "name" : "al", "access" : 1, @@ -21529,196 +21548,196 @@ "access" : 1, "descriptor" : "(I)V" }, { - "method" : "__f_518", + "method" : "__f_514", "owner" : "lz", "name" : "f", "access" : 1, "parameters" : [ ], "descriptor" : "(I)V" }, { - "method" : "__w_519", + "method" : "__w_515", "owner" : "lz", "name" : "w", "access" : 1, "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], "descriptor" : "(IIZZS)V" }, { - "method" : "__o_520", + "method" : "__o_516", "owner" : "lz", "name" : "o", "access" : 0, "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], "descriptor" : "(IIZJ)V" }, { - "method" : "__g_521", + "method" : "__g_517", "owner" : "lz", "name" : "g", "access" : 0, "parameters" : [ ], "descriptor" : "(I)V" }, { - "method" : "__l_522", + "method" : "__l_518", "owner" : "lz", "name" : "l", "access" : 16, "parameters" : [ "arg0", "arg1", "arg2" ], "descriptor" : "(IIZI)V" }, { - "method" : "__e_523", + "method" : "__e_519", "owner" : "lz", "name" : "e", "access" : 16, "parameters" : [ ], "descriptor" : "(B)V" }, { - "method" : "__x_524", + "method" : "__x_520", "owner" : "lz", "name" : "x", "access" : 0, "parameters" : [ ], "descriptor" : "(I)Z" }, { - "method" : "__a_525", + "method" : "__a_521", "owner" : "lz", "name" : "a", "access" : 1, "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], "descriptor" : "(IIIZI)V" }, { - "method" : "__h_526", + "method" : "__h_522", "owner" : "lz", "name" : "h", "access" : 1, "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], "descriptor" : "(Lag;Lhu;Lhu;ZI)V" }, { - "method" : "__p_527", + "method" : "__p_523", "owner" : "lz", "name" : "p", "access" : 0, "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5" ], "descriptor" : "(IIIIIII)Z" }, { - "method" : "__v_528", + "method" : "__v_524", "owner" : "lz", "name" : "v", "access" : 0, "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5" ], "descriptor" : "(IIIIIII)V" }, { - "method" : "__av_529", + "method" : "__av_525", "owner" : "lz", "name" : "av", "access" : 0, "parameters" : [ "arg0" ], "descriptor" : "(IB)F" }, { - "method" : "__ak_530", + "method" : "__ak_526", "owner" : "lz", "name" : "ak", "access" : 1, "parameters" : [ "arg0", "arg1" ], "descriptor" : "(III)V" }, { - "method" : "__aw_531", + "method" : "__aw_527", "owner" : "lz", "name" : "aw", "access" : 1, "parameters" : [ "arg0", "arg1" ], "descriptor" : "(III)V" }, { - "method" : "__al_532", + "method" : "__al_528", "owner" : "lz", "name" : "al", "access" : 1, "parameters" : [ "arg0", "arg1", "arg2" ], "descriptor" : "(IIIB)V" }, { - "method" : "__ab_533", + "method" : "__ab_529", "owner" : "lz", "name" : "ab", "access" : 1, "parameters" : [ "arg0", "arg1", "arg2" ], "descriptor" : "(IIII)V" }, { - "method" : "__ae_534", + "method" : "__ae_530", "owner" : "lz", "name" : "ae", "access" : 1, "parameters" : [ ], "descriptor" : "(I)I" }, { - "method" : "__at_535", + "method" : "__at_531", "owner" : "lz", "name" : "at", "access" : 1, "parameters" : [ ], "descriptor" : "(I)I" }, { - "method" : "__ad_536", + "method" : "__ad_532", "owner" : "lz", "name" : "ad", "access" : 1, "parameters" : [ ], "descriptor" : "(I)Lhu;" }, { - "method" : "__ap_537", + "method" : "__ap_533", "owner" : "lz", "name" : "ap", "access" : 1, "parameters" : [ ], "descriptor" : "(I)I" }, { - "method" : "__as_538", + "method" : "__as_534", "owner" : "lz", "name" : "as", "access" : 1, "parameters" : [ ], "descriptor" : "(I)I" }, { - "method" : "__am_539", + "method" : "__am_535", "owner" : "lz", "name" : "am", "access" : 1, "parameters" : [ "arg0" ], "descriptor" : "(II)V" }, { - "method" : "__an_540", + "method" : "__an_536", "owner" : "lz", "name" : "an", "access" : 1, "parameters" : [ ], "descriptor" : "(I)V" }, { - "method" : "__az_541", + "method" : "__az_537", "owner" : "lz", "name" : "az", "access" : 1, "parameters" : [ "arg0" ], "descriptor" : "(II)V" }, { - "method" : "__au_542", + "method" : "__au_538", "owner" : "lz", "name" : "au", "access" : 1, "parameters" : [ ], "descriptor" : "(I)V" }, { - "method" : "__bk_543", + "method" : "__bk_539", "owner" : "lz", "name" : "bk", "access" : 0, "parameters" : [ ], "descriptor" : "(I)V" }, { - "method" : "__bd_544", + "method" : "__bd_540", "owner" : "lz", "name" : "bd", "access" : 1, "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5" ], "descriptor" : "(IIIIIIB)V" }, { - "method" : "__bc_545", + "method" : "__bc_541", "owner" : "lz", "name" : "bc", "access" : 1, @@ -21750,7 +21769,7 @@ "decoder" : -1916729379 } ], "methods" : [ { - "method" : "__toString_546", + "method" : "__toString_542", "owner" : "lx", "name" : "toString", "access" : 1, @@ -21842,6 +21861,42 @@ "name" : "n", "access" : 8, "descriptor" : "I" + }, { + "field" : "ArchiveDiskActionHandler_lock", + "owner" : "iv", + "name" : "w", + "access" : 8, + "descriptor" : "Ljava/lang/Object;" + }, { + "field" : "ArchiveDiskActionHandler_requestQueue", + "owner" : "iv", + "name" : "m", + "access" : 8, + "descriptor" : "Lje;" + }, { + "field" : "ArchiveDiskActionHandler_responseQueue", + "owner" : "iv", + "name" : "f", + "access" : 8, + "descriptor" : "Lje;" + }, { + "field" : "ArchiveDiskActionHandler_thread", + "owner" : "en", + "name" : "o", + "access" : 8, + "descriptor" : "Ljava/lang/Thread;" + }, { + "field" : "ArchiveDisk_buffer", + "owner" : "ff", + "name" : "m", + "access" : 8, + "descriptor" : "[B" + }, { + "field" : "Archive_crc", + "owner" : "it", + "name" : "aj", + "access" : 8, + "descriptor" : "Ljava/util/zip/CRC32;" }, { "field" : "AttackOption_alwaysRightClick", "owner" : "cj", @@ -21911,6 +21966,36 @@ "name" : "l", "access" : 8, "descriptor" : "Lgt;" + }, { + "field" : "Component_archive", + "owner" : "ho", + "name" : "e", + "access" : 9, + "descriptor" : "Lir;" + }, { + "field" : "Component_cachedFonts", + "owner" : "ho", + "name" : "a", + "access" : 8, + "descriptor" : "Ler;" + }, { + "field" : "Component_cachedModels", + "owner" : "ho", + "name" : "i", + "access" : 8, + "descriptor" : "Ler;" + }, { + "field" : "DefaultsGroup_graphics", + "owner" : "ka", + "name" : "m", + "access" : 24, + "descriptor" : "Lka;" + }, { + "field" : "EnumDefinition_archive", + "owner" : "jw", + "name" : "m", + "access" : 9, + "descriptor" : "Lir;" }, { "field" : "EnumDefinition_cached", "owner" : "jw", @@ -21918,11 +22003,17 @@ "access" : 8, "descriptor" : "Ler;" }, { - "field" : "EnumDefinition_indexCache", - "owner" : "jw", + "field" : "FloorUnderlayDefinition_archive", + "owner" : "ih", "name" : "m", - "access" : 9, + "access" : 8, "descriptor" : "Lir;" + }, { + "field" : "FloorUnderlayDefinition_cached", + "owner" : "ih", + "name" : "f", + "access" : 8, + "descriptor" : "Ler;" }, { "field" : "FontName_bold12", "owner" : "kx", @@ -22020,53 +22111,17 @@ "access" : 8, "descriptor" : "Ler;" }, { - "field" : "HitSplatDefinition_cached", + "field" : "HitmarkDefinition_cached", "owner" : "jm", "name" : "w", "access" : 8, "descriptor" : "Ler;" }, { - "field" : "HitSplatDefinition_cachedFonts", + "field" : "HitmarkDefinition_cachedFonts", "owner" : "jm", "name" : "u", "access" : 8, "descriptor" : "Ler;" - }, { - "field" : "IndexCache_crc", - "owner" : "it", - "name" : "aj", - "access" : 8, - "descriptor" : "Ljava/util/zip/CRC32;" - }, { - "field" : "IndexStoreActionHandler_lock", - "owner" : "iv", - "name" : "w", - "access" : 8, - "descriptor" : "Ljava/lang/Object;" - }, { - "field" : "IndexStoreActionHandler_requestQueue", - "owner" : "iv", - "name" : "m", - "access" : 8, - "descriptor" : "Lje;" - }, { - "field" : "IndexStoreActionHandler_responseQueue", - "owner" : "iv", - "name" : "f", - "access" : 8, - "descriptor" : "Lje;" - }, { - "field" : "IndexStoreActionHandler_thread", - "owner" : "en", - "name" : "o", - "access" : 8, - "descriptor" : "Ljava/lang/Thread;" - }, { - "field" : "IndexStore_buffer", - "owner" : "ff", - "name" : "m", - "access" : 8, - "descriptor" : "[B" }, { "field" : "Instrument_delays", "owner" : "db", @@ -22184,6 +22239,12 @@ "access" : 8, "descriptor" : "I", "decoder" : -114766123 + }, { + "field" : "ItemDefinition_archive", + "owner" : "jv", + "name" : "u", + "access" : 9, + "descriptor" : "Lir;" }, { "field" : "ItemDefinition_cached", "owner" : "jv", @@ -22197,13 +22258,7 @@ "access" : 8, "descriptor" : "Ler;" }, { - "field" : "ItemDefinition_indexCache", - "owner" : "jv", - "name" : "u", - "access" : 9, - "descriptor" : "Lir;" - }, { - "field" : "ItemDefinition_modelIndexCache", + "field" : "ItemDefinition_modelArchive", "owner" : "jv", "name" : "g", "access" : 9, @@ -22233,18 +22288,18 @@ "name" : "cb", "access" : 9, "descriptor" : "[Z" + }, { + "field" : "KitDefinition_archive", + "owner" : "im", + "name" : "m", + "access" : 9, + "descriptor" : "Lir;" }, { "field" : "KitDefinition_cached", "owner" : "im", "name" : "w", "access" : 8, "descriptor" : "Ler;" - }, { - "field" : "KitDefinition_indexCache", - "owner" : "im", - "name" : "m", - "access" : 9, - "descriptor" : "Lir;" }, { "field" : "Login_isUsernameRemembered", "owner" : "client", @@ -22516,6 +22571,12 @@ "access" : 73, "descriptor" : "I", "decoder" : 2000222973 + }, { + "field" : "NetCache_archives", + "owner" : "iq", + "name" : "h", + "access" : 9, + "descriptor" : "[Lit;" }, { "field" : "NetCache_crc", "owner" : "iq", @@ -22535,12 +22596,6 @@ "name" : "i", "access" : 9, "descriptor" : "Liz;" - }, { - "field" : "NetCache_indexCaches", - "owner" : "iq", - "name" : "h", - "access" : 9, - "descriptor" : "[Lit;" }, { "field" : "NetCache_ioExceptions", "owner" : "iq", @@ -22630,6 +22685,12 @@ "name" : "m", "access" : 9, "descriptor" : "Lfu;" + }, { + "field" : "NpcDefinition_archive", + "owner" : "jz", + "name" : "m", + "access" : 8, + "descriptor" : "Lir;" }, { "field" : "NpcDefinition_cached", "owner" : "jz", @@ -22643,14 +22704,14 @@ "access" : 8, "descriptor" : "Ler;" }, { - "field" : "NpcDefinition_indexCache", + "field" : "NpcDefinition_modelArchive", "owner" : "jz", - "name" : "m", + "name" : "f", "access" : 8, "descriptor" : "Lir;" }, { - "field" : "NpcDefinition_modelIndexCache", - "owner" : "jz", + "field" : "ObjectDefinition_archive", + "owner" : "jr", "name" : "f", "access" : 8, "descriptor" : "Lir;" @@ -22666,12 +22727,6 @@ "name" : "g", "access" : 8, "descriptor" : "Ler;" - }, { - "field" : "ObjectDefinition_indexCache", - "owner" : "jr", - "name" : "f", - "access" : 8, - "descriptor" : "Lir;" }, { "field" : "ObjectDefinition_isLowDetail", "owner" : "jr", @@ -22685,7 +22740,7 @@ "access" : 24, "descriptor" : "[I" }, { - "field" : "ParamKeyDefinition_cached", + "field" : "ParamDefinition_cached", "owner" : "jb", "name" : "f", "access" : 8, @@ -23106,18 +23161,18 @@ "name" : "m", "access" : 8, "descriptor" : "Ler;" + }, { + "field" : "SequenceDefinition_archive", + "owner" : "jh", + "name" : "m", + "access" : 9, + "descriptor" : "Lir;" }, { "field" : "SequenceDefinition_cached", "owner" : "jh", "name" : "w", "access" : 9, "descriptor" : "Ler;" - }, { - "field" : "SequenceDefinition_indexCache", - "owner" : "jh", - "name" : "m", - "access" : 9, - "descriptor" : "Lir;" }, { "field" : "Skills_enabled", "owner" : "hc", @@ -23130,6 +23185,12 @@ "name" : "q", "access" : 9, "descriptor" : "[I" + }, { + "field" : "SpotAnimationDefinition_archive", + "owner" : "io", + "name" : "m", + "access" : 9, + "descriptor" : "Lir;" }, { "field" : "SpotAnimationDefinition_cached", "owner" : "io", @@ -23143,13 +23204,7 @@ "access" : 8, "descriptor" : "Ler;" }, { - "field" : "SpotAnimationDefinition_indexCache", - "owner" : "io", - "name" : "m", - "access" : 9, - "descriptor" : "Lir;" - }, { - "field" : "SpotAnimationDefinition_modelIndexCache", + "field" : "SpotAnimationDefinition_modelArchive", "owner" : "io", "name" : "f", "access" : 9, @@ -23672,14 +23727,8 @@ "access" : 25, "descriptor" : "Lkd;" }, { - "field" : "UnderlayDefinition_cached", - "owner" : "ih", - "name" : "f", - "access" : 8, - "descriptor" : "Ler;" - }, { - "field" : "UnderlayDefinition_indexCache", - "owner" : "ih", + "field" : "VarbitDefinition_archive", + "owner" : "ia", "name" : "m", "access" : 8, "descriptor" : "Lir;" @@ -23689,12 +23738,6 @@ "name" : "f", "access" : 9, "descriptor" : "Ler;" - }, { - "field" : "VarbitDefinition_indexCache", - "owner" : "ia", - "name" : "m", - "access" : 8, - "descriptor" : "Lir;" }, { "field" : "VarpDefinition_cached", "owner" : "ix", @@ -23758,24 +23801,6 @@ "access" : 9, "descriptor" : "I", "decoder" : 1535565231 - }, { - "field" : "Widget_cachedFonts", - "owner" : "ho", - "name" : "a", - "access" : 8, - "descriptor" : "Ler;" - }, { - "field" : "Widget_cachedModels", - "owner" : "ho", - "name" : "i", - "access" : 8, - "descriptor" : "Ler;" - }, { - "field" : "Widget_indexCache", - "owner" : "ho", - "name" : "e", - "access" : 9, - "descriptor" : "Lir;" }, { "field" : "WorldMapCacheName_area", "owner" : "aw", @@ -23849,6 +23874,121 @@ "name" : "m", "access" : 9, "descriptor" : "Ljava/applet/Applet;" + }, { + "field" : "archive0", + "owner" : "ir", + "name" : "di", + "access" : 8, + "descriptor" : "Lit;" + }, { + "field" : "archive1", + "owner" : "ek", + "name" : "dc", + "access" : 8, + "descriptor" : "Lit;" + }, { + "field" : "archive10", + "owner" : "j", + "name" : "dv", + "access" : 8, + "descriptor" : "Lit;" + }, { + "field" : "archive11", + "owner" : "cu", + "name" : "do", + "access" : 8, + "descriptor" : "Lit;" + }, { + "field" : "archive12", + "owner" : "cy", + "name" : "dh", + "access" : 8, + "descriptor" : "Lit;" + }, { + "field" : "archive13", + "owner" : "gi", + "name" : "dz", + "access" : 8, + "descriptor" : "Lit;" + }, { + "field" : "archive14", + "owner" : "q", + "name" : "dj", + "access" : 8, + "descriptor" : "Lit;" + }, { + "field" : "archive15", + "owner" : "as", + "name" : "du", + "access" : 8, + "descriptor" : "Lit;" + }, { + "field" : "archive16", + "owner" : "c", + "name" : "eb", + "access" : 8, + "descriptor" : "Lit;" + }, { + "field" : "archive2", + "owner" : "be", + "name" : "dg", + "access" : 8, + "descriptor" : "Lit;" + }, { + "field" : "archive3", + "owner" : "t", + "name" : "db", + "access" : 8, + "descriptor" : "Lit;" + }, { + "field" : "archive4", + "owner" : "v", + "name" : "dd", + "access" : 8, + "descriptor" : "Lit;" + }, { + "field" : "archive5", + "owner" : "cn", + "name" : "dy", + "access" : 8, + "descriptor" : "Lit;" + }, { + "field" : "archive6", + "owner" : "fq", + "name" : "dk", + "access" : 8, + "descriptor" : "Lit;" + }, { + "field" : "archive7", + "owner" : "ad", + "name" : "dl", + "access" : 8, + "descriptor" : "Lit;" + }, { + "field" : "archive8", + "owner" : "p", + "name" : "dr", + "access" : 8, + "descriptor" : "Lit;" + }, { + "field" : "archive9", + "owner" : "il", + "name" : "dw", + "access" : 8, + "descriptor" : "Lit;" + }, { + "field" : "archiveLoaderArchive", + "owner" : "client", + "name" : "sq", + "access" : 8, + "descriptor" : "I", + "decoder" : -1546210597 + }, { + "field" : "archiveLoaders", + "owner" : "client", + "name" : "sy", + "access" : 8, + "descriptor" : "Ljava/util/ArrayList;" }, { "field" : "base37Table", "owner" : "ku", @@ -23875,6 +24015,27 @@ "name" : "j", "access" : 9, "descriptor" : "[Ljava/lang/String;" + }, { + "field" : "camAngleX", + "owner" : "client", + "name" : "hw", + "access" : 8, + "descriptor" : "I", + "decoder" : 410614005 + }, { + "field" : "camAngleY", + "owner" : "client", + "name" : "hp", + "access" : 8, + "descriptor" : "I", + "decoder" : -1163038981 + }, { + "field" : "camFollowHeight", + "owner" : "client", + "name" : "ho", + "access" : 8, + "descriptor" : "I", + "decoder" : 1005832199 }, { "field" : "cameraPitch", "owner" : "t", @@ -23944,13 +24105,13 @@ "access" : 8, "descriptor" : "Lkv;" }, { - "field" : "clickedWidget", + "field" : "clickedComponent", "owner" : "client", "name" : "mc", "access" : 8, "descriptor" : "Lho;" }, { - "field" : "clickedWidgetParent", + "field" : "clickedComponentParent", "owner" : "client", "name" : "mr", "access" : 8, @@ -23993,6 +24154,33 @@ "access" : 8, "descriptor" : "I", "decoder" : -1309758309 + }, { + "field" : "componentClickMasks", + "owner" : "client", + "name" : "on", + "access" : 8, + "descriptor" : "Lld;" + }, { + "field" : "componentClickX", + "owner" : "client", + "name" : "mt", + "access" : 8, + "descriptor" : "I", + "decoder" : -1972775883 + }, { + "field" : "componentClickY", + "owner" : "client", + "name" : "me", + "access" : 8, + "descriptor" : "I", + "decoder" : 1052276727 + }, { + "field" : "componentDragDuration", + "owner" : "bu", + "name" : "no", + "access" : 8, + "descriptor" : "I", + "decoder" : 2059180753 }, { "field" : "cp1252AsciiExtension", "owner" : "kr", @@ -24071,7 +24259,7 @@ "access" : 8, "descriptor" : "Z" }, { - "field" : "dragInventoryWidget", + "field" : "dragInventoryComponent", "owner" : "az", "name" : "jf", "access" : 8, @@ -24358,133 +24546,24 @@ "name" : "a", "access" : 9, "descriptor" : "[Ldy;" - }, { - "field" : "indexCache0", - "owner" : "ir", - "name" : "di", - "access" : 8, - "descriptor" : "Lit;" - }, { - "field" : "indexCache1", - "owner" : "ek", - "name" : "dc", - "access" : 8, - "descriptor" : "Lit;" - }, { - "field" : "indexCache10", - "owner" : "j", - "name" : "dv", - "access" : 8, - "descriptor" : "Lit;" - }, { - "field" : "indexCache11", - "owner" : "cu", - "name" : "do", - "access" : 8, - "descriptor" : "Lit;" - }, { - "field" : "indexCache12", - "owner" : "cy", - "name" : "dh", - "access" : 8, - "descriptor" : "Lit;" - }, { - "field" : "indexCache13", - "owner" : "gi", - "name" : "dz", - "access" : 8, - "descriptor" : "Lit;" - }, { - "field" : "indexCache14", - "owner" : "q", - "name" : "dj", - "access" : 8, - "descriptor" : "Lit;" - }, { - "field" : "indexCache15", - "owner" : "as", - "name" : "du", - "access" : 8, - "descriptor" : "Lit;" - }, { - "field" : "indexCache16", - "owner" : "c", - "name" : "eb", - "access" : 8, - "descriptor" : "Lit;" - }, { - "field" : "indexCache2", - "owner" : "be", - "name" : "dg", - "access" : 8, - "descriptor" : "Lit;" - }, { - "field" : "indexCache3", - "owner" : "t", - "name" : "db", - "access" : 8, - "descriptor" : "Lit;" - }, { - "field" : "indexCache4", - "owner" : "v", - "name" : "dd", - "access" : 8, - "descriptor" : "Lit;" - }, { - "field" : "indexCache5", - "owner" : "cn", - "name" : "dy", - "access" : 8, - "descriptor" : "Lit;" - }, { - "field" : "indexCache6", - "owner" : "fq", - "name" : "dk", - "access" : 8, - "descriptor" : "Lit;" - }, { - "field" : "indexCache7", - "owner" : "ad", - "name" : "dl", - "access" : 8, - "descriptor" : "Lit;" - }, { - "field" : "indexCache8", - "owner" : "p", - "name" : "dr", - "access" : 8, - "descriptor" : "Lit;" - }, { - "field" : "indexCache9", - "owner" : "il", - "name" : "dw", - "access" : 8, - "descriptor" : "Lit;" - }, { - "field" : "indexCacheLoaderIndex", - "owner" : "client", - "name" : "sq", - "access" : 8, - "descriptor" : "I", - "decoder" : -1546210597 - }, { - "field" : "indexCacheLoaders", - "owner" : "client", - "name" : "sy", - "access" : 8, - "descriptor" : "Ljava/util/ArrayList;" - }, { - "field" : "indexStore255", - "owner" : "kz", - "name" : "sc", - "access" : 8, - "descriptor" : "Lff;" }, { "field" : "instanceChunkTemplates", "owner" : "client", "name" : "gq", "access" : 8, "descriptor" : "[[[I" + }, { + "field" : "interfaceComponents", + "owner" : "ho", + "name" : "g", + "access" : 9, + "descriptor" : "[[Lho;" + }, { + "field" : "interfaceParents", + "owner" : "client", + "name" : "mj", + "access" : 8, + "descriptor" : "Lld;" }, { "field" : "isCameraLocked", "owner" : "client", @@ -24492,7 +24571,7 @@ "access" : 8, "descriptor" : "Z" }, { - "field" : "isDraggingWidget", + "field" : "isDraggingComponent", "owner" : "client", "name" : "ny", "access" : 8, @@ -24630,7 +24709,7 @@ "access" : 8, "descriptor" : "[I" }, { - "field" : "loadedWidgetGroups", + "field" : "loadedInterfaces", "owner" : "ho", "name" : "l", "access" : 9, @@ -24710,6 +24789,12 @@ "name" : "gv", "access" : 8, "descriptor" : "[Llq;" + }, { + "field" : "masterDisk", + "owner" : "kz", + "name" : "sc", + "access" : 8, + "descriptor" : "Lff;" }, { "field" : "menuActions", "owner" : "client", @@ -24793,13 +24878,6 @@ "name" : "w", "access" : 9, "descriptor" : "Lhm;" - }, { - "field" : "minimapOrientation", - "owner" : "client", - "name" : "hp", - "access" : 8, - "descriptor" : "I", - "decoder" : -1163038981 }, { "field" : "minimapState", "owner" : "client", @@ -24880,7 +24958,7 @@ "descriptor" : "I", "decoder" : -1628183831 }, { - "field" : "mousedOverWidgetIf1", + "field" : "mousedOverComponentIf1", "owner" : "fa", "name" : "lu", "access" : 8, @@ -24891,13 +24969,6 @@ "name" : "k", "access" : 9, "descriptor" : "Lhe;" - }, { - "field" : "musicTrackArchiveId", - "owner" : "ar", - "name" : "g", - "access" : 9, - "descriptor" : "I", - "decoder" : -18917723 }, { "field" : "musicTrackBoolean", "owner" : "lj", @@ -24911,6 +24982,13 @@ "access" : 9, "descriptor" : "I", "decoder" : -812708185 + }, { + "field" : "musicTrackGroupId", + "owner" : "ar", + "name" : "g", + "access" : 9, + "descriptor" : "I", + "decoder" : -18917723 }, { "field" : "npcAttackOption", "owner" : "client", @@ -25096,6 +25174,12 @@ "name" : "kp", "access" : 24, "descriptor" : "[I" + }, { + "field" : "playerMod", + "owner" : "client", + "name" : "mn", + "access" : 8, + "descriptor" : "Z" }, { "field" : "players", "owner" : "client", @@ -25205,50 +25289,43 @@ "descriptor" : "I", "decoder" : -787495321 }, { - "field" : "rights", - "owner" : "client", - "name" : "mw", - "access" : 8, - "descriptor" : "I", - "decoder" : 821563709 - }, { - "field" : "rootWidgetCount", + "field" : "rootComponentCount", "owner" : "client", "name" : "os", "access" : 8, "descriptor" : "I", "decoder" : -546798303 }, { - "field" : "rootWidgetGroup", - "owner" : "client", - "name" : "mm", - "access" : 8, - "descriptor" : "I", - "decoder" : -783816509 - }, { - "field" : "rootWidgetHeights", + "field" : "rootComponentHeights", "owner" : "client", "name" : "ox", "access" : 8, "descriptor" : "[I" }, { - "field" : "rootWidgetWidths", + "field" : "rootComponentWidths", "owner" : "client", "name" : "oj", "access" : 8, "descriptor" : "[I" }, { - "field" : "rootWidgetXs", + "field" : "rootComponentXs", "owner" : "client", "name" : "oy", "access" : 8, "descriptor" : "[I" }, { - "field" : "rootWidgetYs", + "field" : "rootComponentYs", "owner" : "client", "name" : "oi", "access" : 8, "descriptor" : "[I" + }, { + "field" : "rootInterface", + "owner" : "client", + "name" : "mm", + "access" : 8, + "descriptor" : "I", + "decoder" : -783816509 }, { "field" : "runEnergy", "owner" : "client", @@ -25292,6 +25369,13 @@ "name" : "eu", "access" : 8, "descriptor" : "Lcn;" + }, { + "field" : "selectedItemComponent", + "owner" : "ge", + "name" : "ix", + "access" : 8, + "descriptor" : "I", + "decoder" : -1645409107 }, { "field" : "selectedItemId", "owner" : "cs", @@ -25312,13 +25396,6 @@ "access" : 8, "descriptor" : "I", "decoder" : 1912123225 - }, { - "field" : "selectedItemWidget", - "owner" : "ge", - "name" : "ix", - "access" : 8, - "descriptor" : "I", - "decoder" : -1645409107 }, { "field" : "selectedSpellActionName", "owner" : "client", @@ -25417,6 +25494,13 @@ "name" : "em", "access" : 8, "descriptor" : "Llg;" + }, { + "field" : "staffModLevel", + "owner" : "client", + "name" : "mw", + "access" : 8, + "descriptor" : "I", + "decoder" : 821563709 }, { "field" : "studioGame", "owner" : "c", @@ -25490,6 +25574,12 @@ "name" : "of", "access" : 8, "descriptor" : "Lch;" + }, { + "field" : "viewportComponent", + "owner" : "client", + "name" : "mx", + "access" : 8, + "descriptor" : "Lho;" }, { "field" : "viewportDrawCount", "owner" : "client", @@ -25532,12 +25622,6 @@ "access" : 8, "descriptor" : "I", "decoder" : -81902865 - }, { - "field" : "viewportWidget", - "owner" : "client", - "name" : "mx", - "access" : 8, - "descriptor" : "Lho;" }, { "field" : "viewportWidth", "owner" : "client", @@ -25571,45 +25655,6 @@ "access" : 8, "descriptor" : "I", "decoder" : 36001423 - }, { - "field" : "widgetClickMasks", - "owner" : "client", - "name" : "on", - "access" : 8, - "descriptor" : "Lld;" - }, { - "field" : "widgetClickX", - "owner" : "client", - "name" : "mt", - "access" : 8, - "descriptor" : "I", - "decoder" : -1972775883 - }, { - "field" : "widgetClickY", - "owner" : "client", - "name" : "me", - "access" : 8, - "descriptor" : "I", - "decoder" : 1052276727 - }, { - "field" : "widgetDragDuration", - "owner" : "bu", - "name" : "no", - "access" : 8, - "descriptor" : "I", - "decoder" : 2059180753 - }, { - "field" : "widgetGroupParents", - "owner" : "client", - "name" : "mj", - "access" : 8, - "descriptor" : "Lld;" - }, { - "field" : "widgets", - "owner" : "ho", - "name" : "g", - "access" : 9, - "descriptor" : "[[Lho;" }, { "field" : "worldHost", "owner" : "af", @@ -26291,12 +26336,6 @@ "name" : "jl", "access" : 8, "descriptor" : "Z" - }, { - "field" : "__client_mn", - "owner" : "client", - "name" : "mn", - "access" : 8, - "descriptor" : "Z" }, { "field" : "__client_nn", "owner" : "client", @@ -26523,13 +26562,6 @@ "access" : 8, "descriptor" : "I", "decoder" : -516933613 - }, { - "field" : "__client_ho", - "owner" : "client", - "name" : "ho", - "access" : 8, - "descriptor" : "I", - "decoder" : 1005832199 }, { "field" : "__client_hr", "owner" : "client", @@ -26558,13 +26590,6 @@ "access" : 8, "descriptor" : "I", "decoder" : 218086227 - }, { - "field" : "__client_hw", - "owner" : "client", - "name" : "hw", - "access" : 8, - "descriptor" : "I", - "decoder" : 410614005 }, { "field" : "__client_hx", "owner" : "client", @@ -31733,25 +31758,25 @@ "parameters" : [ "player", "b" ], "descriptor" : "(Lbr;ZI)V" }, { - "method" : "alignWidget", + "method" : "alignComponent", "owner" : "client", "name" : "ip", "access" : 0, - "parameters" : [ "widget" ], + "parameters" : [ "component" ], "descriptor" : "(Lho;B)V" }, { - "method" : "alignWidgetPosition", + "method" : "alignComponentPosition", "owner" : "jf", "name" : "iw", "access" : 8, - "parameters" : [ "widget", "parentWidth", "parentHeight" ], + "parameters" : [ "component", "parentWidth", "parentHeight" ], "descriptor" : "(Lho;IIB)V" }, { - "method" : "alignWidgetSize", + "method" : "alignComponentSize", "owner" : "p", "name" : "ic", "access" : 8, - "parameters" : [ "widget", "parentWidth", "parentHeight", "b" ], + "parameters" : [ "component", "parentWidth", "parentHeight", "b" ], "descriptor" : "(Lho;IIZB)V" }, { "method" : "byteArrayFromObject", @@ -31781,14 +31806,14 @@ "access" : 9, "descriptor" : "([III)V" }, { - "method" : "clickWidget", + "method" : "clickComponent", "owner" : "cq", "name" : "jf", "access" : 24, - "parameters" : [ "widget", "x", "y" ], + "parameters" : [ "component", "x", "y" ], "descriptor" : "(Lho;III)V" }, { - "method" : "closeWidgetGroup", + "method" : "closeInterface", "owner" : "cs", "name" : "jd", "access" : 24, @@ -31876,6 +31901,12 @@ "access" : 24, "parameters" : [ "actor", "a", "b", "c", "d", "e" ], "descriptor" : "(Lbz;IIIIIB)V" + }, { + "method" : "drawInterface", + "owner" : "az", + "name" : "ir", + "access" : 24, + "descriptor" : "([Lho;IIIIIIIII)V" }, { "method" : "drawLoadingMessage", "owner" : "bi", @@ -31895,12 +31926,6 @@ "name" : "x", "access" : 8, "descriptor" : "(Lkk;Lkk;Lkk;I)V" - }, { - "method" : "drawWidgetGroup", - "owner" : "az", - "name" : "ir", - "access" : 24, - "descriptor" : "([Lho;IIIIIIIII)V" }, { "method" : "encodeStringCp1252", "owner" : "dt", @@ -31922,6 +31947,19 @@ "access" : 9, "parameters" : [ "values", "ordinal" ], "descriptor" : "([Lgc;II)Lgc;" + }, { + "method" : "getComponentChild", + "owner" : "gx", + "name" : "f", + "access" : 9, + "descriptor" : "(III)Lho;" + }, { + "method" : "getComponentClickMask", + "owner" : "f", + "name" : "kp", + "access" : 8, + "parameters" : [ "component" ], + "descriptor" : "(Lho;I)I" }, { "method" : "getFrames", "owner" : "bc", @@ -31930,12 +31968,19 @@ "parameters" : [ "id" ], "descriptor" : "(II)Len;" }, { - "method" : "getHitSplatDefinition", + "method" : "getHitmarkDefinition", "owner" : "bp", "name" : "f", "access" : 9, "parameters" : [ "id" ], "descriptor" : "(II)Ljm;" + }, { + "method" : "getInterfaceComponent", + "owner" : "gd", + "name" : "m", + "access" : 9, + "parameters" : [ "id" ], + "descriptor" : "(IB)Lho;" }, { "method" : "getItemDefinition", "owner" : "hc", @@ -31971,7 +32016,7 @@ "parameters" : [ "id" ], "descriptor" : "(II)Ljr;" }, { - "method" : "getParamKeyDefinition", + "method" : "getParamDefinition", "owner" : "hz", "name" : "m", "access" : 9, @@ -32008,26 +32053,6 @@ "access" : 9, "parameters" : [ "id" ], "descriptor" : "(II)I" - }, { - "method" : "getWidget", - "owner" : "gd", - "name" : "m", - "access" : 9, - "parameters" : [ "id" ], - "descriptor" : "(IB)Lho;" - }, { - "method" : "getWidgetChild", - "owner" : "gx", - "name" : "f", - "access" : 9, - "descriptor" : "(III)Lho;" - }, { - "method" : "getWidgetClickMask", - "owner" : "f", - "name" : "kp", - "access" : 8, - "parameters" : [ "widget" ], - "descriptor" : "(Lho;I)I" }, { "method" : "getWorldMapElement", "owner" : "dm", @@ -32084,6 +32109,13 @@ "access" : 8, "parameters" : [ "descriptor" ], "descriptor" : "(Ljava/lang/String;I)Ljava/lang/Class;" + }, { + "method" : "loadInterface", + "owner" : "dr", + "name" : "q", + "access" : 9, + "parameters" : [ "itf" ], + "descriptor" : "(IB)Z" }, { "method" : "loadRegions", "owner" : "af", @@ -32098,13 +32130,6 @@ "access" : 24, "parameters" : [ "buffer", "plane", "x", "y", "x0", "y0", "n" ], "descriptor" : "(Lgr;IIIIIIB)V" - }, { - "method" : "loadWidgetGroup", - "owner" : "dr", - "name" : "q", - "access" : 9, - "parameters" : [ "widgetGroup" ], - "descriptor" : "(IB)Z" }, { "method" : "loadWorlds", "owner" : "ji", @@ -32120,7 +32145,7 @@ "parameters" : [ "argument1", "argument2", "opcode", "argument0", "action", "targetName", "mouseX", "mouseY" ], "descriptor" : "(IIIILjava/lang/String;Ljava/lang/String;III)V" }, { - "method" : "newIndexCache", + "method" : "newArchive", "owner" : "c", "name" : "fw", "access" : 8, @@ -32168,7 +32193,7 @@ "owner" : "le", "name" : "m", "access" : 9, - "parameters" : [ "indexCache", "index", "record" ], + "parameters" : [ "archive", "group", "file" ], "descriptor" : "(Lir;III)Lln;" }, { "method" : "readStringIntParameters", @@ -32194,7 +32219,7 @@ "owner" : "il", "name" : "im", "access" : 24, - "parameters" : [ "widget" ], + "parameters" : [ "component" ], "descriptor" : "(Lho;I)Z" }, { "method" : "runScript", @@ -32210,12 +32235,6 @@ "access" : 8, "parameters" : [ "scriptEvent", "n" ], "descriptor" : "(Lby;II)V" - }, { - "method" : "sendStackTrace", - "owner" : "jz", - "name" : "m", - "access" : 9, - "descriptor" : "(Ljava/lang/String;Ljava/lang/Throwable;I)V" }, { "method" : "setUp", "owner" : "client", @@ -32243,19 +32262,19 @@ "access" : 8, "parameters" : [ "gameState" ], "descriptor" : "(IB)V" + }, { + "method" : "updateInterface", + "owner" : "il", + "name" : "jr", + "access" : 24, + "parameters" : [ "components", "parentId", "a", "b", "c", "d", "x", "y" ], + "descriptor" : "([Lho;IIIIIIII)V" }, { "method" : "updatePlayer", "owner" : "k", "name" : "m", "access" : 24, "descriptor" : "(Lhx;B)V" - }, { - "method" : "updateWidgetGroup", - "owner" : "il", - "name" : "jr", - "access" : 24, - "parameters" : [ "widgets", "parentId", "a", "b", "c", "d", "x", "y" ], - "descriptor" : "([Lho;IIIIIIII)V" }, { "method" : "username", "owner" : "client", diff --git a/injector-plugin/src/main/java/net/runelite/injector/InjectHookMethod.java b/injector-plugin/src/main/java/net/runelite/injector/InjectHookMethod.java index be654e127d..3c304807be 100644 --- a/injector-plugin/src/main/java/net/runelite/injector/InjectHookMethod.java +++ b/injector-plugin/src/main/java/net/runelite/injector/InjectHookMethod.java @@ -33,6 +33,7 @@ import net.runelite.asm.ClassGroup; import net.runelite.asm.Method; import net.runelite.asm.Type; import net.runelite.asm.attributes.Annotations; +import net.runelite.asm.attributes.Code; import net.runelite.asm.attributes.annotation.Annotation; import net.runelite.asm.attributes.code.Instruction; import net.runelite.asm.attributes.code.InstructionType; @@ -89,9 +90,9 @@ public class InjectHookMethod obfuscatedClassName = DeobAnnotations.getObfuscatedName(cf.getAnnotations()); // might be a constructor - if (obfuscatedMethodName == null && method.getName().equals("")) + if (obfuscatedMethodName == null) { - obfuscatedMethodName = ""; + obfuscatedMethodName = method.getName(); } assert obfuscatedClassName != null : "hook on method in class with no obfuscated name"; @@ -110,7 +111,12 @@ public class InjectHookMethod private void injectHookMethod(Method hookMethod, String hookName, boolean end, Method deobMethod, Method vanillaMethod, boolean useHooks) throws InjectionException { - Instructions instructions = vanillaMethod.getCode().getInstructions(); + Code code = vanillaMethod.getCode(); + if (code == null) + { + logger.warn(vanillaMethod + " code is null"); + } + Instructions instructions = code.getInstructions(); Signature.Builder builder = new Signature.Builder() .setReturnType(Type.VOID); // Hooks always return void diff --git a/injector-plugin/src/main/java/net/runelite/injector/InjectUtil.java b/injector-plugin/src/main/java/net/runelite/injector/InjectUtil.java index e00b76428a..1f0275110c 100644 --- a/injector-plugin/src/main/java/net/runelite/injector/InjectUtil.java +++ b/injector-plugin/src/main/java/net/runelite/injector/InjectUtil.java @@ -27,6 +27,33 @@ public class InjectUtil public static Method findMethod(Inject inject, String name) throws InjectionException { + return findMethod(inject, name, null); + } + + public static Method findMethod(Inject inject, String name, String hint) throws InjectionException + { + if (hint != null) + { + ClassFile c = inject.getDeobfuscated().findClass(hint); + + if (c == null) + { + throw new InjectionException("Class " + hint + " doesn't exist. (check capitalization)"); + } + + Method deob = c.findMethod(name); + + if (deob != null) + { + String obfuscatedName = DeobAnnotations.getObfuscatedName(deob.getAnnotations()); + Signature obfuscatedSignature = DeobAnnotations.getObfuscatedSignature(deob); + + ClassFile ob = inject.toObClass(c); + + return ob.findMethod(obfuscatedName, (obfuscatedSignature != null) ? obfuscatedSignature : deob.getDescriptor()); + } + } + for (ClassFile c : inject.getDeobfuscated().getClasses()) { for (Method m : c.getMethods()) diff --git a/injector-plugin/src/main/java/net/runelite/injector/raw/DrawAfterWidgets.java b/injector-plugin/src/main/java/net/runelite/injector/raw/DrawAfterWidgets.java index e2250b894e..5b6f6fbd50 100644 --- a/injector-plugin/src/main/java/net/runelite/injector/raw/DrawAfterWidgets.java +++ b/injector-plugin/src/main/java/net/runelite/injector/raw/DrawAfterWidgets.java @@ -76,8 +76,8 @@ public class DrawAfterWidgets @Export("drawLoggedIn") final void drawLoggedIn() { - if(rootWidgetGroup != -1) { - ClientPreferences.method1809(rootWidgetGroup); + if(rootInterface != -1) { + ClientPreferences.method1809(rootInterface); } int var1; @@ -94,9 +94,9 @@ public class DrawAfterWidgets __client_lq = -1; __client_ln = -1; UserComparator6.__fg_jh = null; - if(rootWidgetGroup != -1) { + if(rootInterface != -1) { rootWidgetCount = 0; - Interpreter.method1977(rootWidgetGroup, 0, 0, SoundCache.canvasWidth, Huffman.canvasHeight, 0, 0, -1); + Interpreter.method1977(rootInterface, 0, 0, SoundCache.canvasWidth, Huffman.canvasHeight, 0, 0, -1); } < -- here appearantly diff --git a/injector-plugin/src/main/java/net/runelite/injector/raw/RenderDraw.java b/injector-plugin/src/main/java/net/runelite/injector/raw/RenderDraw.java index 25cccfc653..6bebd6ccb1 100644 --- a/injector-plugin/src/main/java/net/runelite/injector/raw/RenderDraw.java +++ b/injector-plugin/src/main/java/net/runelite/injector/raw/RenderDraw.java @@ -36,7 +36,7 @@ public class RenderDraw Stopwatch stopwatch = Stopwatch.createStarted(); net.runelite.asm.Method obmethod = findMethod(inject, "drawTile"); - Method renderDraw = findMethod(inject, "renderDraw").getPoolMethod(); + Method renderDraw = findMethod(inject, "draw", "Entity").getPoolMethod(); Instructions ins = obmethod.getCode().getInstructions(); replace(ins, renderDraw); @@ -69,7 +69,7 @@ public class RenderDraw } else if (count != 21) { - log.warn("Found {} renderDraws while 21 were expected. Rev update?", count); + log.warn("Found {} draws while 21 were expected. Rev update?", count); } else { diff --git a/runelite-api/src/main/java/net/runelite/api/PacketBuffer.java b/runelite-api/src/main/java/net/runelite/api/PacketBuffer.java deleted file mode 100644 index a44f4c9ac9..0000000000 --- a/runelite-api/src/main/java/net/runelite/api/PacketBuffer.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.api; - -public interface PacketBuffer -{ -} diff --git a/runelite-api/src/main/java/net/runelite/api/ScriptID.java b/runelite-api/src/main/java/net/runelite/api/ScriptID.java index 62acbe1454..0fdc3ad13b 100644 --- a/runelite-api/src/main/java/net/runelite/api/ScriptID.java +++ b/runelite-api/src/main/java/net/runelite/api/ScriptID.java @@ -200,4 +200,9 @@ public final class ScriptID * Join a clan, duh */ public static final int CUSTOM_JOIN_CLAN = 10690; + + /** + * Send a public message + */ + public static final int PUBLICMSG = 13337; } \ No newline at end of file diff --git a/runelite-api/src/main/java/net/runelite/api/events/MenuOptionClicked.java b/runelite-api/src/main/java/net/runelite/api/events/MenuOptionClicked.java index 2180458228..848beb4b84 100644 --- a/runelite-api/src/main/java/net/runelite/api/events/MenuOptionClicked.java +++ b/runelite-api/src/main/java/net/runelite/api/events/MenuOptionClicked.java @@ -24,7 +24,9 @@ */ package net.runelite.api.events; +import lombok.AccessLevel; import lombok.Data; +import lombok.Setter; import net.runelite.api.MenuAction; import net.runelite.api.MenuEntry; @@ -45,6 +47,13 @@ public class MenuOptionClicked public MenuOptionClicked(MenuEntry entry) { menuEntry = entry; + authentic = true; + } + + public MenuOptionClicked(MenuEntry entry, boolean authentic) + { + menuEntry = entry; + this.authentic = authentic; } /** @@ -129,4 +138,10 @@ public class MenuOptionClicked { this.consumed = true; } + + /** + * Whether or not the event is authentic. + */ + @Setter(AccessLevel.PRIVATE) + private boolean authentic; } diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetType.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetType.java index 9d140c3cd0..cec850036f 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetType.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetType.java @@ -35,4 +35,10 @@ public final class WidgetType public static final int TEXT_INVENTORY = 7; public static final int IF1_TOOLTIP = 8; public static final int LINE = 9; + public static final int FPS = 1336; + public static final int VIEWPORT = 1337; + public static final int MINIMAP = 1338; + public static final int COMPASS = 1339; + public static final int WORLD_MAP = 1400; + public static final int WORLD_MAP_OVERVIEW = 1401; } diff --git a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java index cf8f62744f..5ff9277e18 100644 --- a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java +++ b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java @@ -438,7 +438,7 @@ public class MenuManager @Subscribe public void onMenuOptionClicked(MenuOptionClicked event) { - if (!client.isMenuOpen()) + if (!client.isMenuOpen() && event.isAuthentic()) { rebuildLeftClickMenu(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java index a3ea8a41de..9bbee9f251 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java @@ -445,7 +445,7 @@ public class BoostsPlugin extends Plugin this.displayInfoboxes = config.displayInfoboxes(); this.displayIcons = config.displayIcons(); this.boldIconFont = config.boldIconFont(); - this.displayNextBuffChange = config.displayNextDebuffChange(); + this.displayNextBuffChange = config.displayNextBuffChange(); this.displayNextDebuffChange = config.displayNextDebuffChange(); this.boostThreshold = config.boostThreshold(); this.groupNotifications = config.groupNotifications(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingConfig.java deleted file mode 100644 index 65900900d8..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingConfig.java +++ /dev/null @@ -1,128 +0,0 @@ -/* - * Copyright (c) 2018, Fluffeh - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.client.plugins.flinching; - -import java.awt.Color; -import net.runelite.client.config.Config; -import net.runelite.client.config.ConfigGroup; -import net.runelite.client.config.ConfigItem; -import net.runelite.client.config.Stub; - -@ConfigGroup("flinching") -public interface FlinchingConfig extends Config -{ - - @ConfigItem( - keyName = "flinchStub", - name = "Flinch", - description = "", - position = 1 - ) - default Stub flinchStub() - { - return new Stub(); - } - - @ConfigItem( - position = 2, - keyName = "flinchOnHitReceivedDelay", - name = "Flinch Hit Received Delay", - description = "Slightly longer delay after being attacked milliseconds", - parent = "flinchStub" - ) - default int getFlinchAttackedDelay() - { - return 6600; - } - - @ConfigItem( - position = 3, - keyName = "flinchDelay", - name = "Flinch Timer Delay", - description = "Shows the appropriate time to attack while flinching milliseconds", - parent = "flinchStub" - ) - default int getFlinchDelay() - { - return 5400; - } - - @ConfigItem( - keyName = "overlayStub", - name = "Overlay", - description = "", - position = 4 - ) - default Stub overlayStub() - { - return new Stub(); - } - - @ConfigItem( - position = 5, - keyName = "flinchOverlaySize", - name = "Overlay Diameter", - description = "Flinch overlay timer diameter", - parent = "overlayStub" - ) - default int getFlinchOverlaySize() - { - return 30; - } - - @ConfigItem( - position = 6, - keyName = "hexColorFlinch", - name = "Overlay Color", - description = "Color of flinching timer overlay", - parent = "overlayStub" - ) - default Color getFlinchOverlayColor() - { - return Color.CYAN; - } - - @ConfigItem( - position = 7, - keyName = "flinchResetOnHit", - name = "Reset on Hit", - description = "Timer resets after every attack from your character" - ) - default boolean getFlinchResetOnHit() - { - return true; - } - - @ConfigItem( - position = 8, - keyName = "flinchResetOnHitReceived", - name = "Reset on Hit Received", - description = "Timer resets when your character gets attacked" - ) - default boolean getFlinchResetOnHitReceived() - { - return true; - } -} diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingOverlay.java deleted file mode 100644 index a46289ad80..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingOverlay.java +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Copyright (c) 2018, Fluffeh - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.client.plugins.flinching; - - -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Graphics2D; -import java.util.Map; -import javax.inject.Inject; -import javax.inject.Singleton; -import net.runelite.api.Client; -import net.runelite.api.Perspective; -import net.runelite.api.Point; -import net.runelite.api.coords.LocalPoint; -import net.runelite.api.coords.WorldPoint; -import net.runelite.client.ui.overlay.Overlay; -import net.runelite.client.ui.overlay.OverlayLayer; -import net.runelite.client.ui.overlay.OverlayPosition; -import net.runelite.client.ui.overlay.components.ProgressPieComponent; - -@Singleton -public class FlinchingOverlay extends Overlay -{ - private final Client client; - private final FlinchingPlugin plugin; - - private Color color; - private Color borderColor; - - private int overlaySize; - - @Inject - FlinchingOverlay(Client client, FlinchingPlugin plugin) - { - setPosition(OverlayPosition.DYNAMIC); - setLayer(OverlayLayer.ABOVE_SCENE); - this.plugin = plugin; - this.client = client; - - overlaySize = this.plugin.getFlinchOverlaySize(); - } - - @Override - public Dimension render(Graphics2D graphics) - { - drawOverlays(graphics); - return null; - } - - public void updateConfig() - { - borderColor = plugin.getFlinchOverlayColor(); - color = new Color(borderColor.getRed(), borderColor.getGreen(), borderColor.getBlue(), 100); - - overlaySize = plugin.getFlinchOverlaySize(); - } - - private void drawOverlays(Graphics2D graphics) - { - for (Map.Entry entry : plugin.GetTargets().entrySet()) - { - FlinchingTarget target = entry.getValue(); - - drawFlinchTimer(graphics, target.worldLocation, target.GetRemainingTimePercent()); - } - } - - - private void drawFlinchTimer(Graphics2D graphics, WorldPoint targetLocation, double fillAmount) - { - if (targetLocation.getPlane() != client.getPlane()) - { - return; - } - - LocalPoint localLoc = LocalPoint.fromWorld(client, targetLocation); - if (localLoc == null) - { - return; - } - - Point loc = Perspective.localToCanvas(client, localLoc, client.getPlane()); - - ProgressPieComponent pie = new ProgressPieComponent(); - pie.setDiameter(overlaySize); - pie.setFill(color); - pie.setBorderColor(borderColor); - pie.setPosition(loc); - pie.setProgress(fillAmount); - pie.render(graphics); - } -} \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingPlugin.java deleted file mode 100644 index 0ed62ecd06..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingPlugin.java +++ /dev/null @@ -1,310 +0,0 @@ -/* - * Copyright (c) 2018, Fluffeh - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.client.plugins.flinching; - -import com.google.inject.Provides; -import java.awt.Color; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import javax.inject.Inject; -import javax.inject.Singleton; -import lombok.AccessLevel; -import lombok.Getter; -import lombok.extern.slf4j.Slf4j; -import net.runelite.api.Actor; -import net.runelite.api.Client; -import net.runelite.api.GameState; -import net.runelite.api.NPC; -import net.runelite.api.Player; -import net.runelite.api.events.ConfigChanged; -import net.runelite.api.events.GameStateChanged; -import net.runelite.api.events.GameTick; -import net.runelite.api.events.HitsplatApplied; -import net.runelite.api.events.NpcDespawned; -import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.Subscribe; -import net.runelite.client.plugins.Plugin; -import net.runelite.client.plugins.PluginDescriptor; -import net.runelite.client.plugins.PluginType; -import net.runelite.client.ui.overlay.OverlayManager; - - -@Slf4j -@Singleton -@PluginDescriptor( - name = "Flinching Timer", - description = "Time your attacks while flinching", - tags = {"overlay", "flinching", "timers", "combat"}, - type = PluginType.PVM, - enabledByDefault = false -) - -public class FlinchingPlugin extends Plugin -{ - @Inject - private Client client; - - @Inject - private OverlayManager overlayManager; - - @Inject - private FlinchingConfig config; - - @Inject - private FlinchingOverlay overlay; - - private int currentWorld = -1; - - private int currentInteractingId = -1; - private final Map flinchingTargets = new HashMap<>(); - - private boolean resetOnHit = true; - private boolean resetOnHitReceived = true; - - private int getFlinchAttackedDelay; - private int getFlinchDelay; - @Getter(AccessLevel.PACKAGE) - private int flinchOverlaySize; - @Getter(AccessLevel.PACKAGE) - private Color flinchOverlayColor; - private boolean getFlinchResetOnHit; - private boolean getFlinchResetOnHitReceived; - - @Provides - FlinchingConfig provideConfig(ConfigManager configManager) - { - return configManager.getConfig(FlinchingConfig.class); - } - - @Override - protected void startUp() - { - updateConfig(); - - overlayManager.add(overlay); - - overlay.updateConfig(); - resetOnHit = this.getFlinchResetOnHit; - resetOnHitReceived = this.getFlinchResetOnHitReceived; - - ClearTargets(); - } - - @Override - protected void shutDown() - { - ClearTargets(); - } - - @Subscribe - public void onConfigChanged(ConfigChanged event) - { - if (event.getGroup().equals("flinching")) - { - updateConfig(); - - overlay.updateConfig(); - resetOnHit = this.getFlinchResetOnHit; - resetOnHitReceived = this.getFlinchResetOnHitReceived; - - for (Map.Entry integerFlinchingTargetEntry : flinchingTargets.entrySet()) - { - FlinchingTarget target = integerFlinchingTargetEntry.getValue(); - if (target != null) - { - target.SetDelayTime(this.getFlinchDelay, this.getFlinchAttackedDelay); - } - } - } - } - - @Subscribe - public void onGameStateChanged(GameStateChanged event) - { - if (event.getGameState() == GameState.LOGGED_IN) - { - if (currentWorld == -1) - { - currentWorld = client.getWorld(); - } - else if (currentWorld != client.getWorld()) - { - ClearTargets(); - } - } - } - - private void ClearTargets() - { - Iterator> it = flinchingTargets.entrySet().iterator(); - - while (it.hasNext()) - { - it.remove(); - } - } - - @Subscribe - private void onGameTick(GameTick tick) - { - if (client.getGameState() == GameState.LOGGED_IN) - { - return; - } - - TickTargets(); - checkInteracting(); - } - - @Subscribe - public void onHitsplatApplied(HitsplatApplied hitsplatApplied) - { - Actor actor = hitsplatApplied.getActor(); - - if (actor instanceof NPC) - { - NPC hitTarget = (NPC) actor; - - int hitId = hitTarget.getId(); - if (hitId == currentInteractingId) - { - if (!flinchingTargets.containsKey(hitId)) - { - TargetGained(hitTarget); - } - else - { - FlinchingTarget currentTarget = flinchingTargets.get(hitId); - if (currentTarget != null) - { - if (resetOnHit) - { - currentTarget.TargetHit(); - } - } - } - } - } - else if (resetOnHitReceived && actor == client.getLocalPlayer()) - { - PlayerHit(); - } - } - - private void checkInteracting() - { - Player localPlayer = client.getLocalPlayer(); - Actor interacting = localPlayer.getInteracting(); - - if (interacting instanceof NPC) - { - NPC newTarget = (NPC) interacting; - currentInteractingId = newTarget.getId(); - - if (newTarget.getHealth() <= 0 || newTarget.isDead()) - { - if (flinchingTargets.containsKey(currentInteractingId)) - { - flinchingTargets.remove(currentInteractingId); - currentInteractingId = -1; - } - } - } - } - - private void TickTargets() - { - Iterator> it = flinchingTargets.entrySet().iterator(); - - while (it.hasNext()) - { - FlinchingTarget target = it.next().getValue(); - if (target != null) - { - target.Tick(); - if (!target.isActive) - { - it.remove(); - } - } - else - { - it.remove(); - } - } - } - - @Subscribe - public void onNpcDespawned(NpcDespawned npcDespawned) - { - NPC actor = npcDespawned.getNpc(); - - int actorId = actor.getId(); - if (actor.isDead() && flinchingTargets.containsKey(actorId)) - { - TargetLost(actorId); - } - } - - private void TargetLost(int targetId) - { - flinchingTargets.remove(targetId); - } - - private void TargetGained(NPC _newTarget) - { - FlinchingTarget newTarget = new FlinchingTarget(_newTarget); - newTarget.SetDelayTime(config.getFlinchDelay(), config.getFlinchAttackedDelay()); - flinchingTargets.put(_newTarget.getId(), newTarget); - } - - private void PlayerHit() - { - for (Map.Entry integerFlinchingTargetEntry : flinchingTargets.entrySet()) - { - FlinchingTarget target = integerFlinchingTargetEntry.getValue(); - if (target != null) - { - target.PlayerHit(); - } - } - } - - Map GetTargets() - { - return (flinchingTargets); - } - - private void updateConfig() - { - this.getFlinchAttackedDelay = config.getFlinchAttackedDelay(); - this.getFlinchDelay = config.getFlinchDelay(); - this.flinchOverlaySize = config.getFlinchOverlaySize(); - this.flinchOverlayColor = config.getFlinchOverlayColor(); - this.getFlinchResetOnHit = config.getFlinchResetOnHit(); - this.getFlinchResetOnHitReceived = config.getFlinchResetOnHitReceived(); - } -} diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingTarget.java b/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingTarget.java deleted file mode 100644 index 58d90cb247..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingTarget.java +++ /dev/null @@ -1,145 +0,0 @@ -/* - * Copyright (c) 2018, Fluffeh - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.client.plugins.flinching; - -import java.time.Duration; -import java.time.Instant; -import lombok.AccessLevel; -import lombok.Getter; -import net.runelite.api.NPC; -import net.runelite.api.coords.WorldPoint; - -public class FlinchingTarget -{ - private int currentDisplayLength = 5400; - - private boolean usingHitDelay = false; - - private int displayLength = 5400; - private int displayHitReceivedLength = 6600; - private Instant lastAttacked; - - public boolean isActive; - - @Getter(AccessLevel.PACKAGE) - private int objectId; - private NPC targetObject; - - @Getter(AccessLevel.PACKAGE) - public WorldPoint worldLocation; - - FlinchingTarget(NPC target) - { - isActive = true; - - this.targetObject = target; - this.lastAttacked = Instant.now(); - this.objectId = target.getId(); - this.worldLocation = target.getWorldLocation(); - } - - void TargetHit() - { - boolean shouldHit = true; - if (usingHitDelay) - { - if (GetRemainingTime() > displayLength) - { - shouldHit = false; - } - } - - if (shouldHit) - { - lastAttacked = Instant.now(); - - usingHitDelay = false; - currentDisplayLength = displayLength; - } - } - - double GetRemainingTimePercent() - { - double remainingTime = GetRemainingTime(); - double timePercent = remainingTime / currentDisplayLength; - if (timePercent < 0) - { - timePercent = 0; - } - else if (timePercent > 1) - { - timePercent = 1; - } - - return (timePercent); - } - - private double GetRemainingTime() - { - Duration duration = Duration.between(lastAttacked, Instant.now()); - return ((currentDisplayLength - ((double) duration.toMillis()))); - } - - void Tick() - { - if (targetObject == null) - { - isActive = false; - } - else - { - worldLocation = targetObject.getWorldLocation(); - - double remainingTime = GetRemainingTime(); - if (remainingTime <= 0) - { - isActive = false; - } - } - } - - void SetDelayTime(int delayTime, int delayHitReceivedTime) - { - displayLength = delayTime; - displayHitReceivedLength = delayHitReceivedTime; - - if (usingHitDelay) - { - currentDisplayLength = displayHitReceivedLength; - } - else - { - currentDisplayLength = displayLength; - } - } - - void PlayerHit() - { - usingHitDelay = true; - currentDisplayLength = displayHitReceivedLength; - - lastAttacked = Instant.now(); - } -} \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsPlugin.java index 686b09c152..fb8bffc9d6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsPlugin.java @@ -36,6 +36,7 @@ import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.FocusChanged; +import net.runelite.api.events.GameStateChanged; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; @@ -93,6 +94,10 @@ public class FpsPlugin extends Plugin private final ScheduledExecutorService pingExecutorService = new ExecutorServiceExceptionLogger(Executors.newSingleThreadScheduledExecutor()); + private boolean loaded = false; + + private boolean shutdown; + @Getter(AccessLevel.PACKAGE) private FpsLimitMode limitMode; @@ -128,6 +133,12 @@ public class FpsPlugin extends Plugin overlay.onFocusChanged(event); } + @Subscribe + public void onGameStateChanged(GameStateChanged event) + { + shutdown = event.getGameState() != GameState.LOGGED_IN; + } + @Override protected void startUp() throws Exception { @@ -137,7 +148,13 @@ public class FpsPlugin extends Plugin overlayManager.add(overlay); drawManager.registerEveryFrameListener(drawListener); drawListener.reloadConfig(); - pingExecutorService.scheduleAtFixedRate(this::getPingToCurrentWorld, 5, 5, TimeUnit.SECONDS); + shutdown = client.getGameState() != GameState.LOGGED_IN; + + if (!loaded) + { + pingExecutorService.scheduleAtFixedRate(this::getPingToCurrentWorld, 5, 5, TimeUnit.SECONDS); + loaded = true; + } } @Override @@ -145,12 +162,12 @@ public class FpsPlugin extends Plugin { overlayManager.remove(overlay); drawManager.unregisterEveryFrameListener(drawListener); - pingExecutorService.shutdown(); + shutdown = true; } private void getPingToCurrentWorld() { - if (client.getGameState().equals(GameState.LOGGED_IN) && drawPing) + if (!shutdown && drawPing) { ping = Ping.ping(String.format("oldschool%d.runescape.com", client.getWorld() - 300)); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java index 4623594ead..a4414ca6dc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java @@ -1063,14 +1063,19 @@ public class MenuEntrySwapperPlugin extends Plugin break; } } - - if (option.equals("talk-to")) + + if (option.equals("talk-to") || option.equals("attack")) { if (this.swapPickpocket) { swap(client, "pickpocket", option, target, true); } + } + + if (option.equals("talk-to")) + { + if (this.swapHardWoodGrove && target.contains("rionasta")) { swap(client, "send-parcel", option, target, true); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeConfig.java index bc4f4269ec..3263a9c033 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeConfig.java @@ -142,4 +142,14 @@ public interface MotherlodeConfig extends Config return false; } + @ConfigItem( + keyName = "payDirtMsg", + name = "Pay-dirt!", + description = "Send a public message saying \"Pay-dirt!\" every time a dwarf says \"Pay-dirt!\"", + position = 99 + ) + default boolean payDirtMsg() + { + return false; + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java index 7e202ef3ac..68c1dce8ca 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java @@ -26,6 +26,7 @@ */ package net.runelite.client.plugins.motherlode; +import com.google.common.base.Strings; import com.google.common.collect.HashMultiset; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multiset; @@ -63,6 +64,8 @@ import net.runelite.api.Item; import net.runelite.api.ItemContainer; import net.runelite.api.ItemID; import net.runelite.api.MenuAction; +import net.runelite.api.NPC; +import net.runelite.api.NpcID; import static net.runelite.api.ObjectID.DEPLETED_VEIN_26665; import static net.runelite.api.ObjectID.DEPLETED_VEIN_26666; import static net.runelite.api.ObjectID.DEPLETED_VEIN_26667; @@ -75,6 +78,7 @@ import static net.runelite.api.ObjectID.ROCKFALL; import static net.runelite.api.ObjectID.ROCKFALL_26680; import net.runelite.api.Perspective; import net.runelite.api.Player; +import net.runelite.api.ScriptID; import net.runelite.api.Varbits; import net.runelite.api.WallObject; import net.runelite.api.coords.LocalPoint; @@ -89,6 +93,7 @@ import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.ItemContainerChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.MenuOptionClicked; +import net.runelite.api.events.OverheadTextChanged; import net.runelite.api.events.VarbitChanged; import net.runelite.api.events.WallObjectChanged; import net.runelite.api.events.WallObjectDespawned; @@ -105,6 +110,7 @@ import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.task.Schedule; import net.runelite.client.ui.overlay.OverlayManager; +import net.runelite.client.util.Text; @PluginDescriptor( name = "Motherlode Mine", @@ -212,6 +218,7 @@ public class MotherlodePlugin extends Plugin private boolean notifyOnIdle; @Getter(AccessLevel.PACKAGE) private boolean showTargetVein; + private boolean payDirtMsg; @Provides MotherlodeConfig getConfig(ConfigManager configManager) @@ -321,7 +328,7 @@ public class MotherlodePlugin extends Plugin period = 1, unit = ChronoUnit.SECONDS ) - public void checkMining() + void checkMining() { if (!inMlm) { @@ -722,9 +729,6 @@ public class MotherlodePlugin extends Plugin /** * Checks if the given point is "upstairs" in the mlm. * The upper floor is actually on z=0. - * - * @param localPoint - * @return */ boolean isUpstairs(LocalPoint localPoint) { @@ -755,5 +759,38 @@ public class MotherlodePlugin extends Plugin this.showOresFound = config.showOresFound(); this.notifyOnIdle = config.notifyOnIdle(); this.showTargetVein = config.showTargetVein(); + this.payDirtMsg = config.payDirtMsg(); + } + + @Subscribe + private void onOverheadTextChanged(OverheadTextChanged event) + { + if (!payDirtMsg || Strings.isNullOrEmpty(event.getOverheadText()) || !(event.getActor() instanceof NPC)) + { + return; + } + + switch (((NPC) event.getActor()).getId()) + { + case NpcID.MINER_5606: + case NpcID.MINER_5813: + case NpcID.MINER_5814: + case NpcID.MINER_6565: + case NpcID.MINER_6567: + case NpcID.MINER_6568: + case NpcID.MINER_6569: + case NpcID.MINER_6570: + case NpcID.MINER_6571: + case NpcID.MINER_6572: + case NpcID.MINER_6645: + break; + default: + return; + } + + if ("pay-dirt!".equals(Text.standardize(event.getOverheadText()))) + { + client.runScript(ScriptID.PUBLICMSG, "Pay-dirt!"); + } } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java index 9e6af3cc93..61f438f638 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java @@ -51,6 +51,7 @@ import net.runelite.client.eventbus.Subscribe; import net.runelite.client.game.NPCManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.PluginType; import net.runelite.client.ui.overlay.OverlayManager; @Slf4j @@ -58,6 +59,7 @@ import net.runelite.client.ui.overlay.OverlayManager; name = "NPC Status Timer", description = "Adds a timer on NPC's for their attacks and flinching.", tags = {"flinch", "npc"}, + type = PluginType.PVM, enabledByDefault = false ) @Singleton diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaConfig.java index 38cb016c63..46593c4d32 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaConfig.java @@ -115,4 +115,15 @@ public interface NpcAggroAreaConfig extends Config { return false; } + + @ConfigItem( + keyName = "sendNotification", + name = "Send notification", + description = "Send a notification when the timer runs out", + position = 7 + ) + default boolean sendNotification() + { + return false; + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaOverlay.java index 5a295e2f35..c9c1c4fae2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaOverlay.java @@ -86,6 +86,10 @@ class NpcAggroAreaOverlay extends Overlay outlineColor.getBlue(), 100); } + else + { + plugin.doNotification(); + } renderPath(graphics, lines, outlineColor); return null; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java index d4093c07a5..af60fb56ed 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.npcunaggroarea; import java.awt.Color; import javax.inject.Singleton; import lombok.AccessLevel; +import net.runelite.api.Player; import net.runelite.api.geometry.Geometry; import com.google.common.base.Splitter; import com.google.common.base.Strings; @@ -56,6 +57,7 @@ import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.NpcSpawned; +import net.runelite.client.Notifier; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.game.ItemManager; @@ -116,6 +118,9 @@ public class NpcAggroAreaPlugin extends Plugin @Inject private ConfigManager configManager; + @Inject + private Notifier notifier; + @Getter(AccessLevel.PACKAGE) private final WorldPoint[] safeCenters = new WorldPoint[2]; @@ -137,12 +142,15 @@ public class NpcAggroAreaPlugin extends Plugin private boolean showNotWorkingOverlay; @Getter(AccessLevel.PACKAGE) private boolean hideOverlayHint; + @Getter(AccessLevel.PACKAGE) + private boolean sendNotification; private WorldPoint lastPlayerLocation; private WorldPoint previousUnknownCenter; private boolean loggingIn; private List npcNamePatterns; private boolean notWorkingOverlayShown = false; + private boolean hasSentNotification = false; @Provides NpcAggroAreaConfig provideConfig(ConfigManager configManager) @@ -259,6 +267,7 @@ public class NpcAggroAreaPlugin extends Plugin BufferedImage image = itemManager.getImage(ItemID.ENSOULED_DEMON_HEAD); currentTimer = new AggressionTimer(duration, image, this, active && this.showTimer); infoBoxManager.addInfoBox(currentTimer); + hasSentNotification = false; } private void resetTimer() @@ -417,6 +426,9 @@ public class NpcAggroAreaPlugin extends Plugin npcNamePatterns = NAME_SPLITTER.splitToList(this.configNpcNamePatterns); recheckActive(); break; + case "sendNotification": + hasSentNotification = false; + break; } } @@ -507,6 +519,17 @@ public class NpcAggroAreaPlugin extends Plugin } } + void doNotification() + { + if (hasSentNotification) + { + return; + } + final Player local = client.getLocalPlayer(); + hasSentNotification = true; + notifier.notify("[" + local.getName() + "]'s aggression timer has run out!"); + } + private void updateConfig() { this.alwaysActive = config.alwaysActive(); @@ -516,5 +539,6 @@ public class NpcAggroAreaPlugin extends Plugin this.aggroAreaColor = config.aggroAreaColor(); this.showNotWorkingOverlay = config.showNotWorkingOverlay(); this.hideOverlayHint = config.hideOverlayHint(); + this.sendNotification = config.sendNotification(); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java index f61935e4b7..f587c38818 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java @@ -85,7 +85,7 @@ public class RunepouchOverlay extends WidgetItemOverlay assert AMOUNT_VARBITS.length == RUNE_VARBITS.length; - graphics.setFont(FontManager.getSmallFont(graphics.getFont())); + graphics.setFont(FontManager.getRunescapeSmallFont()); Point location = itemWidget.getCanvasLocation(); StringBuilder tooltipBuilder = new StringBuilder(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/ItemType.java b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/ItemType.java index 692b8a6233..c372f584ea 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/ItemType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/ItemType.java @@ -66,7 +66,7 @@ public enum ItemType { return ItemType.AMMO; } - if (item.getName().contains("rune")) + if (item.getName().toLowerCase().contains("rune")) { return ItemType.RUNE; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java index 3fc78a6532..af1a6685a9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java @@ -401,7 +401,13 @@ public class SuppliesTrackerPlugin extends Plugin { quantity -= newItem.getQuantity(); } - buildEntries(oldItem.getId(), quantity); + // ensure that only positive quantities are added since it is reported + // that sometimes checkUsedRunes is called on the same tick that a player + // gains runes in their inventory + if (quantity > 0) + { + buildEntries(oldItem.getId(), quantity); + } } } } diff --git a/runelite-client/src/main/scripts/SendPublicMessage.rs2asm b/runelite-client/src/main/scripts/SendPublicMessage.rs2asm new file mode 100644 index 0000000000..eccfc90457 --- /dev/null +++ b/runelite-client/src/main/scripts/SendPublicMessage.rs2asm @@ -0,0 +1,39 @@ +;;; +; +; Copyright (c) 2019, Lucas +; All rights reserved. +; +; Redistribution and use in source and binary forms, with or without +; modification, are permitted provided that the following conditions are met: +; +; 1. Redistributions of source code must retain the above copyright notice, this +; list of conditions and the following disclaimer. +; 2. Redistributions in binary form must reproduce the above copyright notice, +; this list of conditions and the following disclaimer in the documentation +; and/or other materials provided with the distribution. +; +; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +; ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +; WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +; DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +; ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +; (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +; ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +; +;;;;;;;;;;;;;;;;;;;;;;;;;;; +; ; +; Send a public message ; +; ; +;;;;;;;;;;;;;;;;;;;;;;;;;;; +.id 13337 +.int_stack_count 0 +.string_stack_count 1 +.int_var_count 0 +.string_var_count 1 + sload 0 + iconst 0 + chat_sendpublic + return diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/CameraMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/CameraMixin.java index 4c231426b6..ee8c0e1bed 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/CameraMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/CameraMixin.java @@ -66,7 +66,7 @@ public abstract class CameraMixin implements RSClient } } - @FieldHook("cameraPitchTarget") + @FieldHook("camAngleX") @Inject static void onCameraPitchTargetChanged(int idx) { diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSAbstractIndexCacheMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSAbstractArchiveMixin.java similarity index 89% rename from runelite-mixins/src/main/java/net/runelite/mixins/RSAbstractIndexCacheMixin.java rename to runelite-mixins/src/main/java/net/runelite/mixins/RSAbstractArchiveMixin.java index 444be65691..5b83be84c9 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSAbstractIndexCacheMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSAbstractArchiveMixin.java @@ -15,12 +15,12 @@ import net.runelite.api.mixins.Mixin; import net.runelite.api.mixins.Replace; import net.runelite.api.mixins.Shadow; import org.slf4j.Logger; -import net.runelite.rs.api.RSAbstractIndexCache; +import net.runelite.rs.api.RSAbstractArchive; import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSIndexCache; +import net.runelite.rs.api.RSArchive; -@Mixin(RSAbstractIndexCache.class) -public abstract class RSAbstractIndexCacheMixin implements RSAbstractIndexCache +@Mixin(RSAbstractArchive.class) +public abstract class RSAbstractArchiveMixin implements RSAbstractArchive { @Shadow("client") private static RSClient client; @@ -35,14 +35,14 @@ public abstract class RSAbstractIndexCacheMixin implements RSAbstractIndexCache return overlayOutdated; } - @Copy("takeRecord") + @Copy("takeFile") abstract byte[] rs$getConfigData(int archiveId, int fileId); - @Replace("takeRecord") + @Replace("takeFile") public byte[] rl$getConfigData(int archiveId, int fileId) { byte[] rsData = rs$getConfigData(archiveId, fileId); - RSIndexCache indexData = (RSIndexCache) this; + RSArchive indexData = (RSArchive) this; if (!OverlayIndex.hasOverlay(indexData.getIndex(), archiveId)) { diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java index 54002e8293..c00cc189ad 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java @@ -51,7 +51,6 @@ import net.runelite.api.MenuEntry; import net.runelite.api.MessageNode; import net.runelite.api.NPC; import net.runelite.api.Node; -import net.runelite.api.PacketBuffer; import static net.runelite.api.Perspective.LOCAL_TILE_SIZE; import net.runelite.api.Player; import net.runelite.api.Point; @@ -111,8 +110,9 @@ import net.runelite.api.mixins.MethodHook; import net.runelite.api.mixins.Mixin; import net.runelite.api.mixins.Replace; import net.runelite.api.mixins.Shadow; +import net.runelite.rs.api.RSPacketBuffer; import org.slf4j.Logger; -import net.runelite.rs.api.RSAbstractIndexCache; +import net.runelite.rs.api.RSAbstractArchive; import net.runelite.rs.api.RSChatChannel; import net.runelite.rs.api.RSClanChat; import net.runelite.rs.api.RSClient; @@ -1253,9 +1253,16 @@ public abstract class RSClientMixin implements RSClient @Replace("menuAction") static void rl$menuAction(int actionParam, int widgetId, int menuAction, int id, String menuOption, String menuTarget, int var6, int var7) { + boolean authentic = true; + if (menuTarget != null && menuTarget.startsWith("!AUTHENTIC")) + { + authentic = false; + menuTarget = menuTarget.substring(10); + } + if (printMenuActions && client.getLogger().isDebugEnabled()) { - client.getLogger().debug("Menuaction: {} {} {} {} {} {} {} {}", actionParam, widgetId, menuAction, id, menuOption, menuTarget, var6, var7); + client.getLogger().debug("Menuaction: {} {} {} {} {} {} {} {} {}", actionParam, widgetId, menuAction, id, menuOption, menuTarget, var6, var7, authentic); } /* Along the way, the RuneScape client may change a menuAction by incrementing it with 2000. @@ -1275,7 +1282,8 @@ public abstract class RSClientMixin implements RSClient actionParam, widgetId, false - ) + ), + authentic ); client.getCallbacks().post(menuOptionClicked); @@ -1289,6 +1297,13 @@ public abstract class RSClientMixin implements RSClient menuOptionClicked.getIdentifier(), menuOptionClicked.getOption(), menuOptionClicked.getTarget(), var6, var7); } + @Override + @Inject + public void invokeMenuAction(int actionParam, int widgetId, int menuAction, int id, String menuOption, String menuTarget, int var6, int var7) + { + client.sendMenuAction(actionParam, widgetId, menuAction, id, menuOption, "!AUTHENTIC" + menuTarget, var6, var7); + } + @FieldHook("Login_username") @Inject public static void onUsernameChanged(int idx) @@ -1329,7 +1344,7 @@ public abstract class RSClientMixin implements RSClient @Inject @MethodHook("updateNpcs") - public static void updateNpcs(boolean var0, PacketBuffer var1) + public static void updateNpcs(boolean var0, RSPacketBuffer var1) { client.getCallbacks().updateNpcs(); } @@ -1355,13 +1370,13 @@ public abstract class RSClientMixin implements RSClient } @Inject - @MethodHook("methodDraw") - public void methodDraw(boolean var1) + @MethodHook("draw") + public void draw(boolean var1) { callbacks.clientMainLoop(); } - @MethodHook("drawWidgetGroup") + @MethodHook("drawInterface") @Inject public static void renderWidgetLayer(Widget[] widgets, int parentId, int minX, int minY, int maxX, int maxY, int x, int y, int var8) { @@ -1464,7 +1479,7 @@ public abstract class RSClientMixin implements RSClient @Override public RSSprite[] getSprites(IndexDataBase source, int archiveId, int fileId) { - RSAbstractIndexCache rsSource = (RSAbstractIndexCache) source; + RSAbstractArchive rsSource = (RSAbstractArchive) source; byte[] configData = rsSource.getConfigData(archiveId, fileId); if (configData == null) { diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSHealthBarDefinitionMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSHealthBarDefinitionMixin.java index f6f31abdf6..383892e7b5 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSHealthBarDefinitionMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSHealthBarDefinitionMixin.java @@ -15,7 +15,7 @@ public abstract class RSHealthBarDefinitionMixin implements RSHealthBarDefinitio @Shadow("client") private static RSClient client; - @MethodHook(value = "read", end = true) + @MethodHook(value = "decode", end = true) @Inject public void onRead(RSBuffer buffer) { diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSTextureMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSTextureMixin.java index b273fec9a6..6715cba2e4 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSTextureMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSTextureMixin.java @@ -44,10 +44,10 @@ public abstract class RSTextureMixin implements RSTexture @Inject private float rl$v; - @Copy("Texture_animate") + @Copy("animate") public abstract void rs$animate(int diff); - @Replace("Texture_animate") + @Replace("animate") public void rl$animate(int diff) { // The client animates textures by cycling the backing pixels of the texture each fram diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/SpriteMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/SpriteMixin.java index 6bb2f91a8b..b08827b18a 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/SpriteMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/SpriteMixin.java @@ -7,7 +7,7 @@ import net.runelite.api.mixins.Copy; import net.runelite.api.mixins.Inject; import net.runelite.api.mixins.Mixin; import net.runelite.api.mixins.Replace; -import net.runelite.rs.api.RSAbstractIndexCache; +import net.runelite.rs.api.RSAbstractArchive; import net.runelite.rs.api.RSClient; import net.runelite.rs.api.RSSprite; @@ -35,13 +35,13 @@ public abstract class SpriteMixin implements RSClient } @Copy("readSprite") - public static RSSprite rs$loadSprite(RSAbstractIndexCache var0, int var1, int var2) + public static RSSprite rs$loadSprite(RSAbstractArchive var0, int var1, int var2) { throw new RuntimeException(); } @Replace("readSprite") - public static RSSprite rl$loadSprite(RSAbstractIndexCache var0, int var1, int var2) + public static RSSprite rl$loadSprite(RSAbstractArchive var0, int var1, int var2) { Sprite sprite = spriteOverrides.get(var1); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractIndexCache.java b/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractArchive.java similarity index 65% rename from runescape-api/src/main/java/net/runelite/rs/api/RSAbstractIndexCache.java rename to runescape-api/src/main/java/net/runelite/rs/api/RSAbstractArchive.java index f561f1e562..052bc4ee74 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractIndexCache.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractArchive.java @@ -3,8 +3,8 @@ package net.runelite.rs.api; import net.runelite.api.IndexDataBase; import net.runelite.mapping.Import; -public interface RSAbstractIndexCache extends IndexDataBase +public interface RSAbstractArchive extends IndexDataBase { - @Import("takeRecord") + @Import("takeFile") byte[] getConfigData(int archiveId, int fileId); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSActor.java b/runescape-api/src/main/java/net/runelite/rs/api/RSActor.java index 24cc729f68..bc094b0f91 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSActor.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSActor.java @@ -100,7 +100,7 @@ public interface RSActor extends RSEntity, Actor // Idle animation - @Import("idleSequence") + @Import("readySequence") @Override void setIdlePoseAnimation(int animation); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSIndexCache.java b/runescape-api/src/main/java/net/runelite/rs/api/RSArchive.java similarity index 64% rename from runescape-api/src/main/java/net/runelite/rs/api/RSIndexCache.java rename to runescape-api/src/main/java/net/runelite/rs/api/RSArchive.java index bf68b6cba4..25f1cb2cef 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSIndexCache.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSArchive.java @@ -2,7 +2,7 @@ package net.runelite.rs.api; import net.runelite.mapping.Import; -public interface RSIndexCache extends RSAbstractIndexCache +public interface RSArchive extends RSAbstractArchive { @Import("index") int getIndex(); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSBuddy.java b/runescape-api/src/main/java/net/runelite/rs/api/RSBuddy.java index e13893c244..77b62b5aca 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSBuddy.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSBuddy.java @@ -5,7 +5,7 @@ import net.runelite.mapping.Import; public interface RSBuddy extends ChatPlayer, RSUser { - @Import("world0") + @Import("getWorld") @Override int getWorld(); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java index a17b549563..421bc5e64e 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java @@ -84,7 +84,7 @@ public interface RSClient extends RSGameShell, Client @Override int getFPS(); - @Import("minimapOrientation") + @Import("camAngleY") @Override int getMapAngle(); @@ -187,7 +187,7 @@ public interface RSClient extends RSGameShell, Client @Override void setDraggedOnWidget(Widget widget); - @Import("widgets") + @Import("interfaceComponents") RSWidget[][] getWidgets(); /** @@ -390,8 +390,7 @@ public interface RSClient extends RSGameShell, Client RSSprite createItemSprite(int itemId, int quantity, int thickness, int borderColor, int stackable, boolean noted); @Import("menuAction") - @Override - void invokeMenuAction(int n2, int n3, int n4, int n5, String string, String string2, int n6, int n7); + void sendMenuAction(int n2, int n3, int n4, int n5, String string, String string2, int n6, int n7); @Import("decodeSprite") void decodeSprite(byte[] data); @@ -441,19 +440,19 @@ public interface RSClient extends RSGameShell, Client @Import("indexedSpritePalette") void setIndexedSpritePalette(int[] indexedSpritePalette); - @Import("indexCache8") + @Import("archive8") @Override - RSAbstractIndexCache getIndexSprites(); + RSAbstractArchive getIndexSprites(); - @Import("indexCache12") + @Import("archive12") @Override - RSAbstractIndexCache getIndexScripts(); + RSAbstractArchive getIndexScripts(); @Import("widgetClickMasks") @Override RSNodeHashTable getWidgetFlags(); - @Import("widgetGroupParents") + @Import("interfaceParents") @Override RSNodeHashTable getComponentTable(); @@ -514,7 +513,7 @@ public interface RSClient extends RSGameShell, Client * Get the widget top group. widgets[topGroup] contains widgets with * parentId -1, which are the widget roots. */ - @Import("rootWidgetGroup") + @Import("rootInterface") int getWidgetRoot(); @Import("WorldMapElement_cached") @@ -662,10 +661,10 @@ public interface RSClient extends RSGameShell, Client * * (1) JAU - Jagex Angle Unit; 1/1024 of a revolution */ - @Import("cameraPitchTarget") + @Import("camAngleX") int getCameraPitchTarget(); - @Import("cameraPitchTarget") + @Import("camAngleX") void setCameraPitchTarget(int pitch); @Import("Scene_cameraPitchSine") @@ -1015,7 +1014,7 @@ public interface RSClient extends RSGameShell, Client boolean isSpellSelected(); @Import("readSoundEffect") - RSSoundEffect getTrack(RSAbstractIndexCache indexData, int id, int var0); + RSSoundEffect getTrack(RSAbstractArchive indexData, int id, int var0); @Import("createRawPcmStream") RSRawPcmStream createRawPcmStream(RSRawSound audioNode, int var0, int volume); @@ -1023,8 +1022,8 @@ public interface RSClient extends RSGameShell, Client @Import("pcmStreamMixer") RSPcmStreamMixer getSoundEffectAudioQueue(); - @Import("indexCache4") - RSAbstractIndexCache getIndexCache4(); + @Import("archive4") + RSAbstractArchive getIndexCache4(); @Import("decimator") RSDecimator getSoundEffectResampler(); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSEntity.java b/runescape-api/src/main/java/net/runelite/rs/api/RSEntity.java index 89229d0fb6..0392a0dbbf 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSEntity.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSEntity.java @@ -40,7 +40,7 @@ public interface RSEntity extends RSNode, Renderable @Override RSModel getModel(); - @Import("renderDraw") + @Import("draw") @Override void draw(int orientation, int pitchSin, int pitchCos, int yawSin, int yawCos, int x, int y, int z, long hash); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSEnumDefinition.java b/runescape-api/src/main/java/net/runelite/rs/api/RSEnumDefinition.java index 0e4206e29a..494cdfb111 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSEnumDefinition.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSEnumDefinition.java @@ -13,13 +13,13 @@ public interface RSEnumDefinition extends EnumDefinition, RSDualNode @Override int[] getIntVals(); - @Import("stringVals") + @Import("strVals") @Override String[] getStringVals(); @Import("defaultInt") int getDefaultInt(); - @Import("defaultString") + @Import("defaultStr") String getDefaultString(); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWidgetGroupParent.java b/runescape-api/src/main/java/net/runelite/rs/api/RSInterfaceParent.java similarity index 70% rename from runescape-api/src/main/java/net/runelite/rs/api/RSWidgetGroupParent.java rename to runescape-api/src/main/java/net/runelite/rs/api/RSInterfaceParent.java index 34c867e031..f89d359baf 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWidgetGroupParent.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSInterfaceParent.java @@ -3,7 +3,7 @@ package net.runelite.rs.api; import net.runelite.api.WidgetNode; import net.runelite.mapping.Import; -public interface RSWidgetGroupParent extends RSNode, WidgetNode +public interface RSInterfaceParent extends RSNode, WidgetNode { @Import("group") @Override diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSNPCDefinition.java b/runescape-api/src/main/java/net/runelite/rs/api/RSNPCDefinition.java index fef328c669..7e6fd4ba16 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSNPCDefinition.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSNPCDefinition.java @@ -9,7 +9,7 @@ public interface RSNPCDefinition extends NPCDefinition @Override String getName(); - @Import("archives") + @Import("models") @Override int[] getModels(); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSPacketBuffer.java b/runescape-api/src/main/java/net/runelite/rs/api/RSPacketBuffer.java index 614734671d..602a497d4a 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSPacketBuffer.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSPacketBuffer.java @@ -1,7 +1,5 @@ package net.runelite.rs.api; -import net.runelite.api.PacketBuffer; - -public interface RSPacketBuffer extends PacketBuffer +public interface RSPacketBuffer { } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSScene.java b/runescape-api/src/main/java/net/runelite/rs/api/RSScene.java index 0949305e33..0b2705397d 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSScene.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSScene.java @@ -34,6 +34,6 @@ public interface RSScene extends Scene @Import("ySize") int getMaxZ(); - @Import("Scene_minPlane") + @Import("minPlane") int getMinLevel(); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSVarbitDefinition.java b/runescape-api/src/main/java/net/runelite/rs/api/RSVarbitDefinition.java index 2624226dd5..947106c183 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSVarbitDefinition.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSVarbitDefinition.java @@ -4,12 +4,12 @@ import net.runelite.mapping.Import; public interface RSVarbitDefinition extends RSDualNode { - @Import("varp") + @Import("baseVar") int getIndex(); - @Import("lowBit") + @Import("startBit") int getLeastSignificantBit(); - @Import("highBit") + @Import("endBit") int getMostSignificantBit(); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java index f8134a75b5..85c45da695 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java @@ -312,7 +312,7 @@ public interface RSWidget extends Widget @Override void setHasListener(boolean hasListener); - @Import("onKeyListener") + @Import("onKey") @Override Object[] getOnKeyListener(); @@ -320,11 +320,11 @@ public interface RSWidget extends Widget @Override Object[] getOnLoadListener(); - @Import("onDialogAbortListener") + @Import("onDialogAbort") @Override void setOnDialogAbortListener(Object... args); - @Import("onKeyListener") + @Import("onKey") @Override void setOnKeyListener(Object... args); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMap.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMap.java index eb7f92d551..c13e58d668 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMap.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMap.java @@ -43,7 +43,7 @@ public interface RSWorldMap extends RenderOverview @Override RSWorldMapManager getWorldMapManager(); - @Import("initializeWorldMap") + @Import("initializeWorldMapManager") @Override void initializeWorldMap(WorldMapData var1); diff --git a/runescape-client/src/main/java/AbstractIndexCache.java b/runescape-client/src/main/java/AbstractArchive.java similarity index 52% rename from runescape-client/src/main/java/AbstractIndexCache.java rename to runescape-client/src/main/java/AbstractArchive.java index 8ba4da29ff..198880b6ba 100644 --- a/runescape-client/src/main/java/AbstractIndexCache.java +++ b/runescape-client/src/main/java/AbstractArchive.java @@ -6,8 +6,8 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ir") -@Implements("AbstractIndexCache") -public abstract class AbstractIndexCache { +@Implements("AbstractArchive") +public abstract class AbstractArchive { @ObfuscatedName("qb") @ObfuscatedSignature( signature = "Lco;" @@ -37,53 +37,53 @@ public abstract class AbstractIndexCache { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache0") - static IndexCache indexCache0; + @Export("archive0") + static Archive archive0; @ObfuscatedName("f") @ObfuscatedGetter( intValue = 1694798923 ) - @Export("archiveCount") - int archiveCount; + @Export("groupCount") + int groupCount; @ObfuscatedName("q") - @Export("archiveIds") - int[] archiveIds; + @Export("groupIds") + int[] groupIds; @ObfuscatedName("w") - @Export("archiveNameHashes") - int[] archiveNameHashes; + @Export("groupNameHashes") + int[] groupNameHashes; @ObfuscatedName("o") @ObfuscatedSignature( signature = "Llv;" ) - @Export("archiveNameHashTable") - IntHashTable archiveNameHashTable; + @Export("groupNameHashTable") + IntHashTable groupNameHashTable; @ObfuscatedName("u") - @Export("archiveCrcs") - int[] archiveCrcs; + @Export("groupCrcs") + int[] groupCrcs; @ObfuscatedName("g") - @Export("archiveVersions") - int[] archiveVersions; + @Export("groupVersions") + int[] groupVersions; @ObfuscatedName("l") - @Export("recordCounts") - int[] recordCounts; + @Export("fileCounts") + int[] fileCounts; @ObfuscatedName("e") - @Export("recordIds") - int[][] recordIds; + @Export("fileIds") + int[][] fileIds; @ObfuscatedName("x") - @Export("recordNameHashes") - int[][] recordNameHashes; + @Export("fileNameHashes") + int[][] fileNameHashes; @ObfuscatedName("d") @ObfuscatedSignature( signature = "[Llv;" ) - @Export("recordNameHashTables") - IntHashTable[] recordNameHashTables; + @Export("fileNameHashTables") + IntHashTable[] fileNameHashTables; @ObfuscatedName("k") - @Export("archives") - Object[] archives; + @Export("groups") + Object[] groups; @ObfuscatedName("n") - @Export("records") - Object[][] records; + @Export("files") + Object[][] files; @ObfuscatedName("a") @ObfuscatedGetter( intValue = -530370811 @@ -91,15 +91,15 @@ public abstract class AbstractIndexCache { @Export("hash") public int hash; @ObfuscatedName("z") - @Export("releaseArchives") - boolean releaseArchives; + @Export("releaseGroups") + boolean releaseGroups; @ObfuscatedName("j") - @Export("shallowRecords") - boolean shallowRecords; + @Export("shallowFiles") + boolean shallowFiles; - AbstractIndexCache(boolean var1, boolean var2) { - this.releaseArchives = var1; - this.shallowRecords = var2; + AbstractArchive(boolean var1, boolean var2) { + this.releaseGroups = var1; + this.shallowFiles = var2; } @ObfuscatedName("m") @@ -107,8 +107,8 @@ public abstract class AbstractIndexCache { signature = "([BB)V", garbageValue = "0" ) - @Export("setIndexReference") - void setIndexReference(byte[] var1) { + @Export("decodeIndex") + void decodeIndex(byte[] var1) { this.hash = WallDecoration.method3257(var1, var1.length); Buffer var2 = new Buffer(Strings.decompressBytes(var1)); int var3 = var2.readUnsignedByte(); @@ -119,57 +119,57 @@ public abstract class AbstractIndexCache { int var4 = var2.readUnsignedByte(); if (var3 >= 7) { - this.archiveCount = var2.method50(); + this.groupCount = var2.method50(); } else { - this.archiveCount = var2.readUnsignedShort(); + this.groupCount = var2.readUnsignedShort(); } int var5 = 0; int var6 = -1; - this.archiveIds = new int[this.archiveCount]; + this.groupIds = new int[this.groupCount]; int var7; if (var3 >= 7) { - for (var7 = 0; var7 < this.archiveCount; ++var7) { - this.archiveIds[var7] = var5 += var2.method50(); - if (this.archiveIds[var7] > var6) { - var6 = this.archiveIds[var7]; + for (var7 = 0; var7 < this.groupCount; ++var7) { + this.groupIds[var7] = var5 += var2.method50(); + if (this.groupIds[var7] > var6) { + var6 = this.groupIds[var7]; } } } else { - for (var7 = 0; var7 < this.archiveCount; ++var7) { - this.archiveIds[var7] = var5 += var2.readUnsignedShort(); - if (this.archiveIds[var7] > var6) { - var6 = this.archiveIds[var7]; + for (var7 = 0; var7 < this.groupCount; ++var7) { + this.groupIds[var7] = var5 += var2.readUnsignedShort(); + if (this.groupIds[var7] > var6) { + var6 = this.groupIds[var7]; } } } - this.archiveCrcs = new int[var6 + 1]; - this.archiveVersions = new int[var6 + 1]; - this.recordCounts = new int[var6 + 1]; - this.recordIds = new int[var6 + 1][]; - this.archives = new Object[var6 + 1]; - this.records = new Object[var6 + 1][]; + this.groupCrcs = new int[var6 + 1]; + this.groupVersions = new int[var6 + 1]; + this.fileCounts = new int[var6 + 1]; + this.fileIds = new int[var6 + 1][]; + this.groups = new Object[var6 + 1]; + this.files = new Object[var6 + 1][]; if (var4 != 0) { - this.archiveNameHashes = new int[var6 + 1]; + this.groupNameHashes = new int[var6 + 1]; - for (var7 = 0; var7 < this.archiveCount; ++var7) { - this.archiveNameHashes[this.archiveIds[var7]] = var2.readInt(); + for (var7 = 0; var7 < this.groupCount; ++var7) { + this.groupNameHashes[this.groupIds[var7]] = var2.readInt(); } - this.archiveNameHashTable = new IntHashTable(this.archiveNameHashes); + this.groupNameHashTable = new IntHashTable(this.groupNameHashes); } - for (var7 = 0; var7 < this.archiveCount; ++var7) { - this.archiveCrcs[this.archiveIds[var7]] = var2.readInt(); + for (var7 = 0; var7 < this.groupCount; ++var7) { + this.groupCrcs[this.groupIds[var7]] = var2.readInt(); } - for (var7 = 0; var7 < this.archiveCount; ++var7) { - this.archiveVersions[this.archiveIds[var7]] = var2.readInt(); + for (var7 = 0; var7 < this.groupCount; ++var7) { + this.groupVersions[this.groupIds[var7]] = var2.readInt(); } - for (var7 = 0; var7 < this.archiveCount; ++var7) { - this.recordCounts[this.archiveIds[var7]] = var2.readUnsignedShort(); + for (var7 = 0; var7 < this.groupCount; ++var7) { + this.fileCounts[this.groupIds[var7]] = var2.readUnsignedShort(); } int var8; @@ -178,55 +178,55 @@ public abstract class AbstractIndexCache { int var11; int var12; if (var3 >= 7) { - for (var7 = 0; var7 < this.archiveCount; ++var7) { - var8 = this.archiveIds[var7]; - var9 = this.recordCounts[var8]; + for (var7 = 0; var7 < this.groupCount; ++var7) { + var8 = this.groupIds[var7]; + var9 = this.fileCounts[var8]; var5 = 0; var10 = -1; - this.recordIds[var8] = new int[var9]; + this.fileIds[var8] = new int[var9]; for (var11 = 0; var11 < var9; ++var11) { - var12 = this.recordIds[var8][var11] = var5 += var2.method50(); + var12 = this.fileIds[var8][var11] = var5 += var2.method50(); if (var12 > var10) { var10 = var12; } } - this.records[var8] = new Object[var10 + 1]; + this.files[var8] = new Object[var10 + 1]; } } else { - for (var7 = 0; var7 < this.archiveCount; ++var7) { - var8 = this.archiveIds[var7]; - var9 = this.recordCounts[var8]; + for (var7 = 0; var7 < this.groupCount; ++var7) { + var8 = this.groupIds[var7]; + var9 = this.fileCounts[var8]; var5 = 0; var10 = -1; - this.recordIds[var8] = new int[var9]; + this.fileIds[var8] = new int[var9]; for (var11 = 0; var11 < var9; ++var11) { - var12 = this.recordIds[var8][var11] = var5 += var2.readUnsignedShort(); + var12 = this.fileIds[var8][var11] = var5 += var2.readUnsignedShort(); if (var12 > var10) { var10 = var12; } } - this.records[var8] = new Object[var10 + 1]; + this.files[var8] = new Object[var10 + 1]; } } if (var4 != 0) { - this.recordNameHashes = new int[var6 + 1][]; - this.recordNameHashTables = new IntHashTable[var6 + 1]; + this.fileNameHashes = new int[var6 + 1][]; + this.fileNameHashTables = new IntHashTable[var6 + 1]; - for (var7 = 0; var7 < this.archiveCount; ++var7) { - var8 = this.archiveIds[var7]; - var9 = this.recordCounts[var8]; - this.recordNameHashes[var8] = new int[this.records[var8].length]; + for (var7 = 0; var7 < this.groupCount; ++var7) { + var8 = this.groupIds[var7]; + var9 = this.fileCounts[var8]; + this.fileNameHashes[var8] = new int[this.files[var8].length]; for (var10 = 0; var10 < var9; ++var10) { - this.recordNameHashes[var8][this.recordIds[var8][var10]] = var2.readInt(); + this.fileNameHashes[var8][this.fileIds[var8][var10]] = var2.readInt(); } - this.recordNameHashTables[var8] = new IntHashTable(this.recordNameHashes[var8]); + this.fileNameHashTables[var8] = new IntHashTable(this.fileNameHashes[var8]); } } @@ -248,9 +248,9 @@ public abstract class AbstractIndexCache { signature = "(III)[B", garbageValue = "1945577069" ) - @Export("takeRecord") - public byte[] takeRecord(int var1, int var2) { - return this.takeRecordEncrypted(var1, var2, (int[])null); + @Export("takeFile") + public byte[] takeFile(int group, int file) { + return this.takeFileEncrypted(group, file, (int[])null); } @ObfuscatedName("w") @@ -258,23 +258,23 @@ public abstract class AbstractIndexCache { signature = "(II[II)[B", garbageValue = "-1363136655" ) - @Export("takeRecordEncrypted") - public byte[] takeRecordEncrypted(int var1, int var2, int[] var3) { - if (var1 >= 0 && var1 < this.records.length && this.records[var1] != null && var2 >= 0 && var2 < this.records[var1].length) { - if (this.records[var1][var2] == null) { - boolean var4 = this.buildRecords(var1, var3); + @Export("takeFileEncrypted") + public byte[] takeFileEncrypted(int group, int file, int[] xteaKey) { + if (group >= 0 && group < this.files.length && this.files[group] != null && file >= 0 && file < this.files[group].length) { + if (this.files[group][file] == null) { + boolean var4 = this.buildFiles(group, xteaKey); if (!var4) { - this.loadArchive(var1); - var4 = this.buildRecords(var1, var3); + this.loadGroup(group); + var4 = this.buildFiles(group, xteaKey); if (!var4) { return null; } } } - byte[] var5 = TextureProvider.byteArrayFromObject(this.records[var1][var2], false); - if (this.shallowRecords) { - this.records[var1][var2] = null; + byte[] var5 = TextureProvider.byteArrayFromObject(this.files[group][file], false); + if (this.shallowFiles) { + this.files[group][file] = null; } return var5; @@ -288,16 +288,16 @@ public abstract class AbstractIndexCache { signature = "(III)Z", garbageValue = "-1822260214" ) - @Export("tryLoadRecord") - public boolean tryLoadRecord(int var1, int var2) { - if (var1 >= 0 && var1 < this.records.length && this.records[var1] != null && var2 >= 0 && var2 < this.records[var1].length) { - if (this.records[var1][var2] != null) { + @Export("tryLoadFile") + public boolean tryLoadFile(int group, int file) { + if (group >= 0 && group < this.files.length && this.files[group] != null && file >= 0 && file < this.files[group].length) { + if (this.files[group][file] != null) { return true; - } else if (this.archives[var1] != null) { + } else if (this.groups[group] != null) { return true; } else { - this.loadArchive(var1); - return this.archives[var1] != null; + this.loadGroup(group); + return this.groups[group] != null; } } else { return false; @@ -310,10 +310,10 @@ public abstract class AbstractIndexCache { garbageValue = "-1923759754" ) public boolean method1(int var1) { - if (this.records.length == 1) { - return this.tryLoadRecord(0, var1); - } else if (this.records[var1].length == 1) { - return this.tryLoadRecord(var1, 0); + if (this.files.length == 1) { + return this.tryLoadFile(0, var1); + } else if (this.files[var1].length == 1) { + return this.tryLoadFile(var1, 0); } else { throw new RuntimeException(); } @@ -324,13 +324,13 @@ public abstract class AbstractIndexCache { signature = "(II)Z", garbageValue = "-374594123" ) - @Export("tryLoadArchive") - public boolean tryLoadArchive(int var1) { - if (this.archives[var1] != null) { + @Export("tryLoadGroup") + public boolean tryLoadGroup(int group) { + if (this.groups[group] != null) { return true; } else { - this.loadArchive(var1); - return this.archives[var1] != null; + this.loadGroup(group); + return this.groups[group] != null; } } @@ -342,11 +342,11 @@ public abstract class AbstractIndexCache { public boolean method2() { boolean var1 = true; - for (int var2 = 0; var2 < this.archiveIds.length; ++var2) { - int var3 = this.archiveIds[var2]; - if (this.archives[var3] == null) { - this.loadArchive(var3); - if (this.archives[var3] == null) { + for (int var2 = 0; var2 < this.groupIds.length; ++var2) { + int var3 = this.groupIds[var2]; + if (this.groups[var3] == null) { + this.loadGroup(var3); + if (this.groups[var3] == null) { var1 = false; } } @@ -360,9 +360,9 @@ public abstract class AbstractIndexCache { signature = "(II)I", garbageValue = "-1809769865" ) - @Export("archiveLoadPercent") - int archiveLoadPercent(int var1) { - return this.archives[var1] != null ? 100 : 0; + @Export("groupLoadPercent") + int groupLoadPercent(int var1) { + return this.groups[var1] != null ? 100 : 0; } @ObfuscatedName("x") @@ -370,12 +370,12 @@ public abstract class AbstractIndexCache { signature = "(IS)[B", garbageValue = "-10015" ) - @Export("takeRecordFlat") - public byte[] takeRecordFlat(int var1) { - if (this.records.length == 1) { - return this.takeRecord(0, var1); - } else if (this.records[var1].length == 1) { - return this.takeRecord(var1, 0); + @Export("takeFileFlat") + public byte[] takeFileFlat(int groupOrFile) { + if (this.files.length == 1) { + return this.takeFile(0, groupOrFile); + } else if (this.files[groupOrFile].length == 1) { + return this.takeFile(groupOrFile, 0); } else { throw new RuntimeException(); } @@ -386,21 +386,21 @@ public abstract class AbstractIndexCache { signature = "(III)[B", garbageValue = "-755739011" ) - @Export("getRecord") - public byte[] getRecord(int var1, int var2) { - if (var1 >= 0 && var1 < this.records.length && this.records[var1] != null && var2 >= 0 && var2 < this.records[var1].length) { - if (this.records[var1][var2] == null) { - boolean var3 = this.buildRecords(var1, (int[])null); + @Export("getFile") + public byte[] getFile(int group, int file) { + if (group >= 0 && group < this.files.length && this.files[group] != null && file >= 0 && file < this.files[group].length) { + if (this.files[group][file] == null) { + boolean var3 = this.buildFiles(group, (int[])null); if (!var3) { - this.loadArchive(var1); - var3 = this.buildRecords(var1, (int[])null); + this.loadGroup(group); + var3 = this.buildFiles(group, (int[])null); if (!var3) { return null; } } } - byte[] var4 = TextureProvider.byteArrayFromObject(this.records[var1][var2], false); + byte[] var4 = TextureProvider.byteArrayFromObject(this.files[group][file], false); return var4; } else { return null; @@ -412,12 +412,12 @@ public abstract class AbstractIndexCache { signature = "(IB)[B", garbageValue = "68" ) - @Export("getRecordFlat") - public byte[] getRecordFlat(int var1) { - if (this.records.length == 1) { - return this.getRecord(0, var1); - } else if (this.records[var1].length == 1) { - return this.getRecord(var1, 0); + @Export("getFileFlat") + public byte[] getFileFlat(int groupOrFile) { + if (this.files.length == 1) { + return this.getFile(0, groupOrFile); + } else if (this.files[groupOrFile].length == 1) { + return this.getFile(groupOrFile, 0); } else { throw new RuntimeException(); } @@ -428,8 +428,8 @@ public abstract class AbstractIndexCache { signature = "(II)V", garbageValue = "-1829145107" ) - @Export("loadArchive") - void loadArchive(int var1) { + @Export("loadGroup") + void loadGroup(int group) { } @ObfuscatedName("j") @@ -438,7 +438,7 @@ public abstract class AbstractIndexCache { garbageValue = "28" ) public int[] method3(int var1) { - return var1 >= 0 && var1 < this.recordIds.length ? this.recordIds[var1] : null; + return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null; } @ObfuscatedName("s") @@ -447,7 +447,7 @@ public abstract class AbstractIndexCache { garbageValue = "1178362496" ) public int method4(int var1) { - return this.records[var1].length; + return this.files[var1].length; } @ObfuscatedName("t") @@ -456,7 +456,7 @@ public abstract class AbstractIndexCache { garbageValue = "1702434573" ) public int method5() { - return this.records.length; + return this.files.length; } @ObfuscatedName("y") @@ -465,8 +465,8 @@ public abstract class AbstractIndexCache { garbageValue = "38" ) public void method6() { - for (int var1 = 0; var1 < this.archives.length; ++var1) { - this.archives[var1] = null; + for (int var1 = 0; var1 < this.groups.length; ++var1) { + this.groups[var1] = null; } } @@ -477,8 +477,8 @@ public abstract class AbstractIndexCache { garbageValue = "330258899" ) public void method7(int var1) { - for (int var2 = 0; var2 < this.records[var1].length; ++var2) { - this.records[var1][var2] = null; + for (int var2 = 0; var2 < this.files[var1].length; ++var2) { + this.files[var1][var2] = null; } } @@ -489,10 +489,10 @@ public abstract class AbstractIndexCache { garbageValue = "-709581639" ) public void method8() { - for (int var1 = 0; var1 < this.records.length; ++var1) { - if (this.records[var1] != null) { - for (int var2 = 0; var2 < this.records[var1].length; ++var2) { - this.records[var1][var2] = null; + for (int var1 = 0; var1 < this.files.length; ++var1) { + if (this.files[var1] != null) { + for (int var2 = 0; var2 < this.files[var1].length; ++var2) { + this.files[var1][var2] = null; } } } @@ -504,14 +504,14 @@ public abstract class AbstractIndexCache { signature = "(I[II)Z", garbageValue = "-1835696874" ) - @Export("buildRecords") - boolean buildRecords(int var1, int[] var2) { - if (this.archives[var1] == null) { + @Export("buildFiles") + boolean buildFiles(int group, int[] xteaKey) { + if (this.groups[group] == null) { return false; } else { - int var3 = this.recordCounts[var1]; - int[] var4 = this.recordIds[var1]; - Object[] var5 = this.records[var1]; + int var3 = this.fileCounts[group]; + int[] var4 = this.fileIds[group]; + Object[] var5 = this.files[group]; boolean var6 = true; for (int var7 = 0; var7 < var3; ++var7) { @@ -525,17 +525,17 @@ public abstract class AbstractIndexCache { return true; } else { byte[] var18; - if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) { - var18 = TextureProvider.byteArrayFromObject(this.archives[var1], false); + if (xteaKey == null || xteaKey[0] == 0 && xteaKey[1] == 0 && xteaKey[2] == 0 && xteaKey[3] == 0) { + var18 = TextureProvider.byteArrayFromObject(this.groups[group], false); } else { - var18 = TextureProvider.byteArrayFromObject(this.archives[var1], true); + var18 = TextureProvider.byteArrayFromObject(this.groups[group], true); Buffer var8 = new Buffer(var18); - var8.xteaDecrypt(var2, 5, var8.array.length); + var8.xteaDecrypt(xteaKey, 5, var8.array.length); } byte[] var19 = Strings.decompressBytes(var18); - if (this.releaseArchives) { - this.archives[var1] = null; + if (this.releaseGroups) { + this.groups[group] = null; } if (var3 > 1) { @@ -580,13 +580,13 @@ public abstract class AbstractIndexCache { } for (var14 = 0; var14 < var3; ++var14) { - if (!this.shallowRecords) { + if (!this.shallowFiles) { var5[var4[var14]] = Projectile.byteArrayToObject(var20[var14], false); } else { var5[var4[var14]] = var20[var14]; } } - } else if (!this.shallowRecords) { + } else if (!this.shallowFiles) { var5[var4[0]] = Projectile.byteArrayToObject(var19, false); } else { var5[var4[0]] = var19; @@ -602,10 +602,10 @@ public abstract class AbstractIndexCache { signature = "(Ljava/lang/String;I)I", garbageValue = "-224510300" ) - @Export("getArchiveId") - public int getArchiveId(String var1) { - var1 = var1.toLowerCase(); - return this.archiveNameHashTable.get(Client.hashString(var1)); + @Export("getGroupId") + public int getGroupId(String groupName) { + groupName = groupName.toLowerCase(); + return this.groupNameHashTable.get(Client.hashString(groupName)); } @ObfuscatedName("v") @@ -613,10 +613,10 @@ public abstract class AbstractIndexCache { signature = "(ILjava/lang/String;I)I", garbageValue = "-443631072" ) - @Export("getRecordId") - public int getRecordId(int var1, String var2) { - var2 = var2.toLowerCase(); - return this.recordNameHashTables[var1].get(Client.hashString(var2)); + @Export("getFileId") + public int getFileId(int group, String fileName) { + fileName = fileName.toLowerCase(); + return this.fileNameHashTables[group].get(Client.hashString(fileName)); } @ObfuscatedName("ag") @@ -627,11 +627,11 @@ public abstract class AbstractIndexCache { public boolean method9(String var1, String var2) { var1 = var1.toLowerCase(); var2 = var2.toLowerCase(); - int var3 = this.archiveNameHashTable.get(Client.hashString(var1)); + int var3 = this.groupNameHashTable.get(Client.hashString(var1)); if (var3 < 0) { return false; } else { - int var4 = this.recordNameHashTables[var3].get(Client.hashString(var2)); + int var4 = this.fileNameHashTables[var3].get(Client.hashString(var2)); return var4 >= 0; } } @@ -641,13 +641,13 @@ public abstract class AbstractIndexCache { signature = "(Ljava/lang/String;Ljava/lang/String;S)[B", garbageValue = "-22726" ) - @Export("takeRecordByNames") - public byte[] takeRecordByNames(String var1, String var2) { - var1 = var1.toLowerCase(); - var2 = var2.toLowerCase(); - int var3 = this.archiveNameHashTable.get(Client.hashString(var1)); - int var4 = this.recordNameHashTables[var3].get(Client.hashString(var2)); - return this.takeRecord(var3, var4); + @Export("takeFileByNames") + public byte[] takeFileByNames(String groupName, String fileName) { + groupName = groupName.toLowerCase(); + fileName = fileName.toLowerCase(); + int var3 = this.groupNameHashTable.get(Client.hashString(groupName)); + int var4 = this.fileNameHashTables[var3].get(Client.hashString(fileName)); + return this.takeFile(var3, var4); } @ObfuscatedName("aj") @@ -655,13 +655,13 @@ public abstract class AbstractIndexCache { signature = "(Ljava/lang/String;Ljava/lang/String;I)Z", garbageValue = "2140743930" ) - @Export("tryLoadRecordByNames") - public boolean tryLoadRecordByNames(String var1, String var2) { - var1 = var1.toLowerCase(); - var2 = var2.toLowerCase(); - int var3 = this.archiveNameHashTable.get(Client.hashString(var1)); - int var4 = this.recordNameHashTables[var3].get(Client.hashString(var2)); - return this.tryLoadRecord(var3, var4); + @Export("tryLoadFileByNames") + public boolean tryLoadFileByNames(String groupName, String fileName) { + groupName = groupName.toLowerCase(); + fileName = fileName.toLowerCase(); + int var3 = this.groupNameHashTable.get(Client.hashString(groupName)); + int var4 = this.fileNameHashTables[var3].get(Client.hashString(fileName)); + return this.tryLoadFile(var3, var4); } @ObfuscatedName("av") @@ -669,11 +669,11 @@ public abstract class AbstractIndexCache { signature = "(Ljava/lang/String;I)Z", garbageValue = "-1282569336" ) - @Export("tryLoadArchiveByName") - public boolean tryLoadArchiveByName(String var1) { - var1 = var1.toLowerCase(); - int var2 = this.archiveNameHashTable.get(Client.hashString(var1)); - return this.tryLoadArchive(var2); + @Export("tryLoadGroupByName") + public boolean tryLoadGroupByName(String groupName) { + groupName = groupName.toLowerCase(); + int var2 = this.groupNameHashTable.get(Client.hashString(groupName)); + return this.tryLoadGroup(var2); } @ObfuscatedName("ar") @@ -683,7 +683,7 @@ public abstract class AbstractIndexCache { ) public void method10(String var1) { var1 = var1.toLowerCase(); - int var2 = this.archiveNameHashTable.get(Client.hashString(var1)); + int var2 = this.groupNameHashTable.get(Client.hashString(var1)); if (var2 >= 0) { this.vmethod129(var2); } @@ -695,11 +695,11 @@ public abstract class AbstractIndexCache { signature = "(Ljava/lang/String;I)I", garbageValue = "-1645224643" ) - @Export("archiveLoadPercentByName") - public int archiveLoadPercentByName(String var1) { - var1 = var1.toLowerCase(); - int var2 = this.archiveNameHashTable.get(Client.hashString(var1)); - return this.archiveLoadPercent(var2); + @Export("groupLoadPercentByName") + public int groupLoadPercentByName(String groupName) { + groupName = groupName.toLowerCase(); + int var2 = this.groupNameHashTable.get(Client.hashString(groupName)); + return this.groupLoadPercent(var2); } @ObfuscatedName("m") @@ -708,28 +708,28 @@ public abstract class AbstractIndexCache { garbageValue = "15597880" ) @Export("readStringIntParameters") - static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) { - int var2 = var0.readUnsignedByte(); + static final IterableNodeHashTable readStringIntParameters(Buffer buffer, IterableNodeHashTable hashTable) { + int var2 = buffer.readUnsignedByte(); int var3; - if (var1 == null) { + if (hashTable == null) { var3 = World.method1759(var2); - var1 = new IterableNodeHashTable(var3); + hashTable = new IterableNodeHashTable(var3); } for (var3 = 0; var3 < var2; ++var3) { - boolean var4 = var0.readUnsignedByte() == 1; - int var5 = var0.readMedium(); + boolean var4 = buffer.readUnsignedByte() == 1; + int var5 = buffer.readMedium(); Object var6; if (var4) { - var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); + var6 = new ObjectNode(buffer.readStringCp1252NullTerminated()); } else { - var6 = new IntegerNode(var0.readInt()); + var6 = new IntegerNode(buffer.readInt()); } - var1.put((Node)var6, (long)var5); + hashTable.put((Node)var6, (long)var5); } - return var1; + return hashTable; } @ObfuscatedName("m") @@ -738,8 +738,8 @@ public abstract class AbstractIndexCache { garbageValue = "-4702" ) @Export("runScript") - public static void runScript(ScriptEvent var0) { - GrandExchangeEvent.runScript0(var0, 500000); + public static void runScript(ScriptEvent scriptEvent) { + GrandExchangeEvent.runScript0(scriptEvent, 500000); } @ObfuscatedName("eg") @@ -748,14 +748,14 @@ public abstract class AbstractIndexCache { garbageValue = "308670894" ) static boolean method4585() { - if (Client.indexCacheLoaders != null && Client.indexCacheLoaderIndex < Client.indexCacheLoaders.size()) { - while (Client.indexCacheLoaderIndex < Client.indexCacheLoaders.size()) { - IndexCacheLoader var0 = (IndexCacheLoader)Client.indexCacheLoaders.get(Client.indexCacheLoaderIndex); + if (Client.archiveLoaders != null && Client.archiveLoaderArchive < Client.archiveLoaders.size()) { + while (Client.archiveLoaderArchive < Client.archiveLoaders.size()) { + ArchiveLoader var0 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoaderArchive); if (!var0.method134()) { return false; } - ++Client.indexCacheLoaderIndex; + ++Client.archiveLoaderArchive; } return true; diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java index 87e40aa100..509818dd92 100644 --- a/runescape-client/src/main/java/AbstractByteArrayCopier.java +++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java @@ -13,7 +13,7 @@ public abstract class AbstractByteArrayCopier { @ObfuscatedSignature( signature = "Lit;" ) - static IndexCache field0; + static Archive field0; @ObfuscatedName("m") @ObfuscatedSignature( @@ -29,7 +29,7 @@ public abstract class AbstractByteArrayCopier { garbageValue = "-2034091753" ) @Export("set") - abstract void set(byte[] var1); + abstract void set(byte[] array); @ObfuscatedName("f") @ObfuscatedSignature( @@ -42,7 +42,7 @@ public abstract class AbstractByteArrayCopier { if (var1 != null) { return var1; } else { - byte[] var2 = VarcInt.field942.takeRecord(19, var0); + byte[] var2 = VarcInt.field942.takeFile(19, var0); var1 = new VarcInt(); if (var2 != null) { var1.method354(new Buffer(var2)); @@ -58,17 +58,17 @@ public abstract class AbstractByteArrayCopier { signature = "(II)V", garbageValue = "-1941491045" ) - @Export("unloadWidgetGroup") - public static void unloadWidgetGroup(int var0) { - if (var0 != -1 && Widget.loadedWidgetGroups[var0]) { - Widget.Widget_indexCache.method7(var0); - if (Widget.widgets[var0] != null) { + @Export("unloadInterface") + public static void unloadInterface(int var0) { + if (var0 != -1 && Widget.loadedInterfaces[var0]) { + Widget.Widget_archive.method7(var0); + if (Widget.interfaceComponents[var0] != null) { boolean var1 = true; - for (int var2 = 0; var2 < Widget.widgets[var0].length; ++var2) { - if (Widget.widgets[var0][var2] != null) { - if (Widget.widgets[var0][var2].type != 2) { - Widget.widgets[var0][var2] = null; + for (int var2 = 0; var2 < Widget.interfaceComponents[var0].length; ++var2) { + if (Widget.interfaceComponents[var0][var2] != null) { + if (Widget.interfaceComponents[var0][var2].type != 2) { + Widget.interfaceComponents[var0][var2] = null; } else { var1 = false; } @@ -76,10 +76,10 @@ public abstract class AbstractByteArrayCopier { } if (var1) { - Widget.widgets[var0] = null; + Widget.interfaceComponents[var0] = null; } - Widget.loadedWidgetGroups[var0] = false; + Widget.loadedInterfaces[var0] = false; } } @@ -92,7 +92,7 @@ public abstract class AbstractByteArrayCopier { ) static void method4024() { PacketBufferNode var0 = Interpreter.method1915(ClientPacket.field257, Client.packetWriter.isaacCipher); - var0.packetBuffer.writeByte(SpotAnimationDefinition.method4822()); + var0.packetBuffer.writeByte(SpotAnimationDefinition.getWindowedMode()); var0.packetBuffer.writeShort(SoundCache.canvasWidth); var0.packetBuffer.writeShort(Huffman.canvasHeight); Client.packetWriter.method241(var0); diff --git a/runescape-client/src/main/java/AbstractFont.java b/runescape-client/src/main/java/AbstractFont.java index a387cfe60f..6cd19a4b75 100644 --- a/runescape-client/src/main/java/AbstractFont.java +++ b/runescape-client/src/main/java/AbstractFont.java @@ -111,28 +111,28 @@ public abstract class AbstractFont extends Rasterizer2D { @ObfuscatedName("m") @Export("drawGlyph") - abstract void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6); + abstract void drawGlyph(byte[] pixels, int x, int y, int width, int height, int color); @ObfuscatedName("f") @Export("drawGlyphAlpha") - abstract void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7); + abstract void drawGlyphAlpha(byte[] pixels, int x, int y, int width, int height, int color, int alpha); @ObfuscatedName("l") @Export("readMetrics") - void readMetrics(byte[] var1) { + void readMetrics(byte[] bytes) { this.advances = new int[256]; int var2; - if (var1.length == 257) { + if (bytes.length == 257) { for (var2 = 0; var2 < this.advances.length; ++var2) { - this.advances[var2] = var1[var2] & 255; + this.advances[var2] = bytes[var2] & 255; } - this.ascent = var1[256] & 255; + this.ascent = bytes[256] & 255; } else { var2 = 0; for (int var3 = 0; var3 < 256; ++var3) { - this.advances[var3] = var1[var2++] & 255; + this.advances[var3] = bytes[var2++] & 255; } int[] var12 = new int[256]; @@ -140,11 +140,11 @@ public abstract class AbstractFont extends Rasterizer2D { int var5; for (var5 = 0; var5 < 256; ++var5) { - var12[var5] = var1[var2++] & 255; + var12[var5] = bytes[var2++] & 255; } for (var5 = 0; var5 < 256; ++var5) { - var4[var5] = var1[var2++] & 255; + var4[var5] = bytes[var2++] & 255; } byte[][] var6 = new byte[256][]; @@ -155,7 +155,7 @@ public abstract class AbstractFont extends Rasterizer2D { byte var9 = 0; for (var7 = 0; var7 < var6[var8].length; ++var7) { - var9 += var1[var2++]; + var9 += bytes[var2++]; var6[var8][var7] = var9; } } @@ -168,7 +168,7 @@ public abstract class AbstractFont extends Rasterizer2D { byte var10 = 0; for (int var11 = 0; var11 < var13[var14].length; ++var11) { - var10 += var1[var2++]; + var10 += bytes[var2++]; var13[var14][var11] = var10; } } @@ -258,7 +258,7 @@ public abstract class AbstractFont extends Rasterizer2D { @ObfuscatedName("a") @Export("breakLines") - public int breakLines(String var1, int[] var2, String[] var3) { + public int breakLines(String var1, int[] lineWidths, String[] linesDst) { if (var1 == null) { return 0; } else { @@ -285,7 +285,7 @@ public abstract class AbstractFont extends Rasterizer2D { var6.append(var16); var6.append('>'); if (var16.equals("br")) { - var3[var12] = var6.toString().substring(var5, var6.length()); + linesDst[var12] = var6.toString().substring(var5, var6.length()); ++var12; var5 = var6.length(); var4 = 0; @@ -334,8 +334,8 @@ public abstract class AbstractFont extends Rasterizer2D { var9 = 1; } - if (var2 != null && var4 > var2[var12 < var2.length ? var12 : var2.length - 1] && var7 >= 0) { - var3[var12] = var6.toString().substring(var5, var7 - var9); + if (lineWidths != null && var4 > lineWidths[var12 < lineWidths.length ? var12 : lineWidths.length - 1] && var7 >= 0) { + linesDst[var12] = var6.toString().substring(var5, var7 - var9); ++var12; var5 = var7; var7 = -1; @@ -354,7 +354,7 @@ public abstract class AbstractFont extends Rasterizer2D { String var19 = var6.toString(); if (var19.length() > var5) { - var3[var12++] = var19.substring(var5, var19.length()); + linesDst[var12++] = var19.substring(var5, var19.length()); } return var12; @@ -363,8 +363,8 @@ public abstract class AbstractFont extends Rasterizer2D { @ObfuscatedName("z") @Export("lineWidth") - public int lineWidth(String var1, int var2) { - int var3 = this.breakLines(var1, new int[]{var2}, AbstractFont_lines); + public int lineWidth(String var1, int lineWidth) { + int var3 = this.breakLines(var1, new int[]{lineWidth}, AbstractFont_lines); int var4 = 0; for (int var5 = 0; var5 < var3; ++var5) { @@ -379,106 +379,106 @@ public abstract class AbstractFont extends Rasterizer2D { @ObfuscatedName("j") @Export("lineCount") - public int lineCount(String var1, int var2) { - return this.breakLines(var1, new int[]{var2}, AbstractFont_lines); + public int lineCount(String var1, int lineWidth) { + return this.breakLines(var1, new int[]{lineWidth}, AbstractFont_lines); } @ObfuscatedName("t") @Export("draw") - public void draw(String var1, int var2, int var3, int var4, int var5) { + public void draw(String var1, int x, int y, int color, int shadow) { if (var1 != null) { - this.reset(var4, var5); - this.draw0(var1, var2, var3); + this.reset(color, shadow); + this.draw0(var1, x, y); } } @ObfuscatedName("y") @Export("drawAlpha") - public void drawAlpha(String var1, int var2, int var3, int var4, int var5, int var6) { + public void drawAlpha(String var1, int x, int y, int color, int shadow, int alpha) { if (var1 != null) { - this.reset(var4, var5); - AbstractFont_alpha = var6; - this.draw0(var1, var2, var3); + this.reset(color, shadow); + AbstractFont_alpha = alpha; + this.draw0(var1, x, y); } } @ObfuscatedName("h") @Export("drawRightAligned") - public void drawRightAligned(String var1, int var2, int var3, int var4, int var5) { + public void drawRightAligned(String var1, int x, int y, int color, int shadow) { if (var1 != null) { - this.reset(var4, var5); - this.draw0(var1, var2 - this.stringWidth(var1), var3); + this.reset(color, shadow); + this.draw0(var1, x - this.stringWidth(var1), y); } } @ObfuscatedName("b") @Export("drawCentered") - public void drawCentered(String var1, int var2, int var3, int var4, int var5) { + public void drawCentered(String var1, int x, int y, int color, int shadow) { if (var1 != null) { - this.reset(var4, var5); - this.draw0(var1, var2 - this.stringWidth(var1) / 2, var3); + this.reset(color, shadow); + this.draw0(var1, x - this.stringWidth(var1) / 2, y); } } @ObfuscatedName("c") @Export("drawLines") - public int drawLines(String var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { + public int drawLines(String var1, int x, int y, int width, int height, int color, int shadow, int xAlignment, int yAlignment, int lineHeight) { if (var1 == null) { return 0; } else { - this.reset(var6, var7); - if (var10 == 0) { - var10 = this.ascent; + this.reset(color, shadow); + if (lineHeight == 0) { + lineHeight = this.ascent; } - int[] var11 = new int[]{var4}; - if (var5 < var10 + this.maxAscent + this.maxDescent && var5 < var10 + var10) { + int[] var11 = new int[]{width}; + if (height < lineHeight + this.maxAscent + this.maxDescent && height < lineHeight + lineHeight) { var11 = null; } int var12 = this.breakLines(var1, var11, AbstractFont_lines); - if (var9 == 3 && var12 == 1) { - var9 = 1; + if (yAlignment == 3 && var12 == 1) { + yAlignment = 1; } int var13; int var14; - if (var9 == 0) { - var13 = var3 + this.maxAscent; - } else if (var9 == 1) { - var13 = var3 + (var5 - this.maxAscent - this.maxDescent - var10 * (var12 - 1)) / 2 + this.maxAscent; - } else if (var9 == 2) { - var13 = var3 + var5 - this.maxDescent - var10 * (var12 - 1); + if (yAlignment == 0) { + var13 = y + this.maxAscent; + } else if (yAlignment == 1) { + var13 = y + (height - this.maxAscent - this.maxDescent - lineHeight * (var12 - 1)) / 2 + this.maxAscent; + } else if (yAlignment == 2) { + var13 = y + height - this.maxDescent - lineHeight * (var12 - 1); } else { - var14 = (var5 - this.maxAscent - this.maxDescent - var10 * (var12 - 1)) / (var12 + 1); + var14 = (height - this.maxAscent - this.maxDescent - lineHeight * (var12 - 1)) / (var12 + 1); if (var14 < 0) { var14 = 0; } - var13 = var3 + var14 + this.maxAscent; - var10 += var14; + var13 = y + var14 + this.maxAscent; + lineHeight += var14; } for (var14 = 0; var14 < var12; ++var14) { - if (var8 == 0) { - this.draw0(AbstractFont_lines[var14], var2, var13); - } else if (var8 == 1) { - this.draw0(AbstractFont_lines[var14], var2 + (var4 - this.stringWidth(AbstractFont_lines[var14])) / 2, var13); - } else if (var8 == 2) { - this.draw0(AbstractFont_lines[var14], var2 + var4 - this.stringWidth(AbstractFont_lines[var14]), var13); + if (xAlignment == 0) { + this.draw0(AbstractFont_lines[var14], x, var13); + } else if (xAlignment == 1) { + this.draw0(AbstractFont_lines[var14], x + (width - this.stringWidth(AbstractFont_lines[var14])) / 2, var13); + } else if (xAlignment == 2) { + this.draw0(AbstractFont_lines[var14], x + width - this.stringWidth(AbstractFont_lines[var14]), var13); } else if (var14 == var12 - 1) { - this.draw0(AbstractFont_lines[var14], var2, var13); + this.draw0(AbstractFont_lines[var14], x, var13); } else { - this.calculateLineJustification(AbstractFont_lines[var14], var4); - this.draw0(AbstractFont_lines[var14], var2, var13); + this.calculateLineJustification(AbstractFont_lines[var14], width); + this.draw0(AbstractFont_lines[var14], x, var13); AbstractFont_justificationTotal = 0; } - var13 += var10; + var13 += lineHeight; } return var12; @@ -487,44 +487,44 @@ public abstract class AbstractFont extends Rasterizer2D { @ObfuscatedName("p") @Export("drawCenteredWave") - public void drawCenteredWave(String var1, int var2, int var3, int var4, int var5, int var6) { + public void drawCenteredWave(String var1, int x, int y, int color, int shadow, int seed) { if (var1 != null) { - this.reset(var4, var5); + this.reset(color, shadow); int[] var7 = new int[var1.length()]; for (int var8 = 0; var8 < var1.length(); ++var8) { - var7[var8] = (int)(Math.sin((double)var8 / 2.0D + (double)var6 / 5.0D) * 5.0D); + var7[var8] = (int)(Math.sin((double)var8 / 2.0D + (double)seed / 5.0D) * 5.0D); } - this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, (int[])null, var7); + this.drawWithOffsets0(var1, x - this.stringWidth(var1) / 2, y, (int[])null, var7); } } @ObfuscatedName("v") @Export("drawCenteredWave2") - public void drawCenteredWave2(String var1, int var2, int var3, int var4, int var5, int var6) { + public void drawCenteredWave2(String var1, int x, int y, int color, int shadow, int seed) { if (var1 != null) { - this.reset(var4, var5); + this.reset(color, shadow); int[] var7 = new int[var1.length()]; int[] var8 = new int[var1.length()]; for (int var9 = 0; var9 < var1.length(); ++var9) { - var7[var9] = (int)(Math.sin((double)var9 / 5.0D + (double)var6 / 5.0D) * 5.0D); - var8[var9] = (int)(Math.sin((double)var9 / 3.0D + (double)var6 / 5.0D) * 5.0D); + var7[var9] = (int)(Math.sin((double)var9 / 5.0D + (double)seed / 5.0D) * 5.0D); + var8[var9] = (int)(Math.sin((double)var9 / 3.0D + (double)seed / 5.0D) * 5.0D); } - this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, var7, var8); + this.drawWithOffsets0(var1, x - this.stringWidth(var1) / 2, y, var7, var8); } } @ObfuscatedName("ag") @Export("drawCenteredShake") - public void drawCenteredShake(String var1, int var2, int var3, int var4, int var5, int var6, int var7) { + public void drawCenteredShake(String var1, int x, int y, int color, int shadow, int seed, int seed2) { if (var1 != null) { - this.reset(var4, var5); - double var8 = 7.0D - (double)var7 / 8.0D; + this.reset(color, shadow); + double var8 = 7.0D - (double)seed2 / 8.0D; if (var8 < 0.0D) { var8 = 0.0D; } @@ -532,20 +532,20 @@ public abstract class AbstractFont extends Rasterizer2D { int[] var10 = new int[var1.length()]; for (int var11 = 0; var11 < var1.length(); ++var11) { - var10[var11] = (int)(Math.sin((double)var11 / 1.5D + (double)var6 / 1.0D) * var8); + var10[var11] = (int)(Math.sin((double)var11 / 1.5D + (double)seed / 1.0D) * var8); } - this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, (int[])null, var10); + this.drawWithOffsets0(var1, x - this.stringWidth(var1) / 2, y, (int[])null, var10); } } @ObfuscatedName("aq") @Export("drawRandomAlphaAndSpacing") - public void drawRandomAlphaAndSpacing(String var1, int var2, int var3, int var4, int var5, int var6) { + public void drawRandomAlphaAndSpacing(String var1, int x, int y, int color, int shadow, int seed) { if (var1 != null) { - this.reset(var4, var5); - AbstractFont_random.setSeed((long)var6); + this.reset(color, shadow); + AbstractFont_random.setSeed((long)seed); AbstractFont_alpha = 192 + (AbstractFont_random.nextInt() & 31); int[] var7 = new int[var1.length()]; int var8 = 0; @@ -557,20 +557,20 @@ public abstract class AbstractFont extends Rasterizer2D { } } - this.drawWithOffsets0(var1, var2, var3, var7, (int[])null); + this.drawWithOffsets0(var1, x, y, var7, (int[])null); } } @ObfuscatedName("aj") @Export("reset") - void reset(int var1, int var2) { + void reset(int color, int shadow) { AbstractFont_strike = -1; AbstractFont_underline = -1; - AbstractFont_previousShadow = var2; - AbstractFont_shadow = var2; - AbstractFont_previousColor = var1; - AbstractFont_color = var1; + AbstractFont_previousShadow = shadow; + AbstractFont_shadow = shadow; + AbstractFont_previousColor = color; + AbstractFont_color = color; AbstractFont_alpha = 256; AbstractFont_justificationTotal = 0; AbstractFont_justificationCurrent = 0; @@ -612,7 +612,7 @@ public abstract class AbstractFont extends Rasterizer2D { @ObfuscatedName("ar") @Export("calculateLineJustification") - void calculateLineJustification(String var1, int var2) { + void calculateLineJustification(String var1, int lineWidth) { int var3 = 0; boolean var4 = false; @@ -628,15 +628,15 @@ public abstract class AbstractFont extends Rasterizer2D { } if (var3 > 0) { - AbstractFont_justificationTotal = (var2 - this.stringWidth(var1) << 8) / var3; + AbstractFont_justificationTotal = (lineWidth - this.stringWidth(var1) << 8) / var3; } } @ObfuscatedName("ac") @Export("draw0") - void draw0(String var1, int var2, int var3) { - var3 -= this.ascent; + void draw0(String var1, int x, int y) { + y -= this.ascent; int var4 = -1; int var5 = -1; @@ -658,8 +658,8 @@ public abstract class AbstractFont extends Rasterizer2D { try { var8 = MouseHandler.method1085(var9.substring(4)); IndexedSprite var13 = AbstractFont_modIconSprites[var8]; - var13.drawAt(var2, var3 + this.ascent - var13.height); - var2 += var13.width; + var13.drawAt(x, y + this.ascent - var13.height); + x += var13.width; var5 = -1; } catch (Exception var11) { } @@ -679,7 +679,7 @@ public abstract class AbstractFont extends Rasterizer2D { if (var4 == -1) { if (this.kerning != null && var5 != -1) { - var2 += this.kerning[var7 + (var5 << 8)]; + x += this.kerning[var7 + (var5 << 8)]; } int var12 = this.widths[var7]; @@ -687,33 +687,33 @@ public abstract class AbstractFont extends Rasterizer2D { if (var7 != ' ') { if (AbstractFont_alpha == 256) { if (AbstractFont_shadow != -1) { - AbstractFont_drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var8, AbstractFont_shadow); + AbstractFont_drawGlyph(this.pixels[var7], x + this.leftBearings[var7] + 1, y + this.topBearings[var7] + 1, var12, var8, AbstractFont_shadow); } - this.drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var8, AbstractFont_color); + this.drawGlyph(this.pixels[var7], x + this.leftBearings[var7], y + this.topBearings[var7], var12, var8, AbstractFont_color); } else { if (AbstractFont_shadow != -1) { - AbstractFont_drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var8, AbstractFont_shadow, AbstractFont_alpha); + AbstractFont_drawGlyphAlpha(this.pixels[var7], x + this.leftBearings[var7] + 1, y + this.topBearings[var7] + 1, var12, var8, AbstractFont_shadow, AbstractFont_alpha); } - this.drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var8, AbstractFont_color, AbstractFont_alpha); + this.drawGlyphAlpha(this.pixels[var7], x + this.leftBearings[var7], y + this.topBearings[var7], var12, var8, AbstractFont_color, AbstractFont_alpha); } } else if (AbstractFont_justificationTotal > 0) { AbstractFont_justificationCurrent += AbstractFont_justificationTotal; - var2 += AbstractFont_justificationCurrent >> 8; + x += AbstractFont_justificationCurrent >> 8; AbstractFont_justificationCurrent &= 255; } int var10 = this.advances[var7]; if (AbstractFont_strike != -1) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var10, AbstractFont_strike); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(x, y + (int)((double)this.ascent * 0.7D), var10, AbstractFont_strike); } if (AbstractFont_underline != -1) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent + 1, var10, AbstractFont_underline); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(x, y + this.ascent + 1, var10, AbstractFont_underline); } - var2 += var10; + x += var10; var5 = var7; } } @@ -724,8 +724,8 @@ public abstract class AbstractFont extends Rasterizer2D { @ObfuscatedName("ay") @Export("drawWithOffsets0") - void drawWithOffsets0(String var1, int var2, int var3, int[] var4, int[] var5) { - var3 -= this.ascent; + void drawWithOffsets0(String var1, int x, int y, int[] xs, int[] ys) { + y -= this.ascent; int var6 = -1; int var7 = -1; int var8 = 0; @@ -748,14 +748,14 @@ public abstract class AbstractFont extends Rasterizer2D { if (!var14.equals("gt")) { if (var14.startsWith("img=")) { try { - if (var4 != null) { - var11 = var4[var8]; + if (xs != null) { + var11 = xs[var8]; } else { var11 = 0; } - if (var5 != null) { - var12 = var5[var8]; + if (ys != null) { + var12 = ys[var8]; } else { var12 = 0; } @@ -763,8 +763,8 @@ public abstract class AbstractFont extends Rasterizer2D { ++var8; var13 = MouseHandler.method1085(var14.substring(4)); IndexedSprite var18 = AbstractFont_modIconSprites[var13]; - var18.drawAt(var11 + var2, var12 + (var3 + this.ascent - var18.height)); - var2 += var18.width; + var18.drawAt(var11 + x, var12 + (y + this.ascent - var18.height)); + x += var18.width; var7 = -1; } catch (Exception var16) { } @@ -784,19 +784,19 @@ public abstract class AbstractFont extends Rasterizer2D { if (var6 == -1) { if (this.kerning != null && var7 != -1) { - var2 += this.kerning[var10 + (var7 << 8)]; + x += this.kerning[var10 + (var7 << 8)]; } int var17 = this.widths[var10]; var11 = this.heights[var10]; - if (var4 != null) { - var12 = var4[var8]; + if (xs != null) { + var12 = xs[var8]; } else { var12 = 0; } - if (var5 != null) { - var13 = var5[var8]; + if (ys != null) { + var13 = ys[var8]; } else { var13 = 0; } @@ -805,33 +805,33 @@ public abstract class AbstractFont extends Rasterizer2D { if (var10 != ' ') { if (AbstractFont_alpha == 256) { if (AbstractFont_shadow != -1) { - AbstractFont_drawGlyph(this.pixels[var10], var12 + var2 + this.leftBearings[var10] + 1, var3 + var13 + this.topBearings[var10] + 1, var17, var11, AbstractFont_shadow); + AbstractFont_drawGlyph(this.pixels[var10], var12 + x + this.leftBearings[var10] + 1, y + var13 + this.topBearings[var10] + 1, var17, var11, AbstractFont_shadow); } - this.drawGlyph(this.pixels[var10], var12 + var2 + this.leftBearings[var10], var3 + var13 + this.topBearings[var10], var17, var11, AbstractFont_color); + this.drawGlyph(this.pixels[var10], var12 + x + this.leftBearings[var10], y + var13 + this.topBearings[var10], var17, var11, AbstractFont_color); } else { if (AbstractFont_shadow != -1) { - AbstractFont_drawGlyphAlpha(this.pixels[var10], var12 + var2 + this.leftBearings[var10] + 1, var3 + var13 + this.topBearings[var10] + 1, var17, var11, AbstractFont_shadow, AbstractFont_alpha); + AbstractFont_drawGlyphAlpha(this.pixels[var10], var12 + x + this.leftBearings[var10] + 1, y + var13 + this.topBearings[var10] + 1, var17, var11, AbstractFont_shadow, AbstractFont_alpha); } - this.drawGlyphAlpha(this.pixels[var10], var12 + var2 + this.leftBearings[var10], var3 + var13 + this.topBearings[var10], var17, var11, AbstractFont_color, AbstractFont_alpha); + this.drawGlyphAlpha(this.pixels[var10], var12 + x + this.leftBearings[var10], y + var13 + this.topBearings[var10], var17, var11, AbstractFont_color, AbstractFont_alpha); } } else if (AbstractFont_justificationTotal > 0) { AbstractFont_justificationCurrent += AbstractFont_justificationTotal; - var2 += AbstractFont_justificationCurrent >> 8; + x += AbstractFont_justificationCurrent >> 8; AbstractFont_justificationCurrent &= 255; } int var15 = this.advances[var10]; if (AbstractFont_strike != -1) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var15, AbstractFont_strike); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(x, y + (int)((double)this.ascent * 0.7D), var15, AbstractFont_strike); } if (AbstractFont_underline != -1) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent, var15, AbstractFont_underline); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(x, y + this.ascent, var15, AbstractFont_underline); } - var2 += var15; + x += var15; var7 = var10; } } @@ -907,43 +907,43 @@ public abstract class AbstractFont extends Rasterizer2D { @ObfuscatedName("ah") @Export("AbstractFont_drawGlyph") - static void AbstractFont_drawGlyph(byte[] var0, int var1, int var2, int var3, int var4, int var5) { - int var6 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; - int var7 = Rasterizer2D.Rasterizer2D_width - var3; + static void AbstractFont_drawGlyph(byte[] pixels, int x, int y, int width, int height, int color) { + int var6 = x + y * Rasterizer2D.Rasterizer2D_width; + int var7 = Rasterizer2D.Rasterizer2D_width - width; int var8 = 0; int var9 = 0; int var10; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { - var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2; - var4 -= var10; - var2 = Rasterizer2D.Rasterizer2D_yClipStart; - var9 += var3 * var10; + if (y < Rasterizer2D.Rasterizer2D_yClipStart) { + var10 = Rasterizer2D.Rasterizer2D_yClipStart - y; + height -= var10; + y = Rasterizer2D.Rasterizer2D_yClipStart; + var9 += width * var10; var6 += var10 * Rasterizer2D.Rasterizer2D_width; } - if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { - var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; + if (y + height > Rasterizer2D.Rasterizer2D_yClipEnd) { + height -= y + height - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { - var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1; - var3 -= var10; - var1 = Rasterizer2D.Rasterizer2D_xClipStart; + if (x < Rasterizer2D.Rasterizer2D_xClipStart) { + var10 = Rasterizer2D.Rasterizer2D_xClipStart - x; + width -= var10; + x = Rasterizer2D.Rasterizer2D_xClipStart; var9 += var10; var6 += var10; var8 += var10; var7 += var10; } - if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { - var10 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; - var3 -= var10; + if (width + x > Rasterizer2D.Rasterizer2D_xClipEnd) { + var10 = width + x - Rasterizer2D.Rasterizer2D_xClipEnd; + width -= var10; var8 += var10; var7 += var10; } - if (var3 > 0 && var4 > 0) { - AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var9, var6, var3, var4, var7, var8); + if (width > 0 && height > 0) { + AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, pixels, color, var9, var6, width, height, var7, var8); } } @@ -998,43 +998,43 @@ public abstract class AbstractFont extends Rasterizer2D { @ObfuscatedName("aw") @Export("AbstractFont_drawGlyphAlpha") - static void AbstractFont_drawGlyphAlpha(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6) { - int var7 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; - int var8 = Rasterizer2D.Rasterizer2D_width - var3; + static void AbstractFont_drawGlyphAlpha(byte[] pixels, int x, int y, int width, int height, int color, int alpha) { + int var7 = x + y * Rasterizer2D.Rasterizer2D_width; + int var8 = Rasterizer2D.Rasterizer2D_width - width; int var9 = 0; int var10 = 0; int var11; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { - var11 = Rasterizer2D.Rasterizer2D_yClipStart - var2; - var4 -= var11; - var2 = Rasterizer2D.Rasterizer2D_yClipStart; - var10 += var3 * var11; + if (y < Rasterizer2D.Rasterizer2D_yClipStart) { + var11 = Rasterizer2D.Rasterizer2D_yClipStart - y; + height -= var11; + y = Rasterizer2D.Rasterizer2D_yClipStart; + var10 += width * var11; var7 += var11 * Rasterizer2D.Rasterizer2D_width; } - if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { - var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; + if (y + height > Rasterizer2D.Rasterizer2D_yClipEnd) { + height -= y + height - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { - var11 = Rasterizer2D.Rasterizer2D_xClipStart - var1; - var3 -= var11; - var1 = Rasterizer2D.Rasterizer2D_xClipStart; + if (x < Rasterizer2D.Rasterizer2D_xClipStart) { + var11 = Rasterizer2D.Rasterizer2D_xClipStart - x; + width -= var11; + x = Rasterizer2D.Rasterizer2D_xClipStart; var10 += var11; var7 += var11; var9 += var11; var8 += var11; } - if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { - var11 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; - var3 -= var11; + if (width + x > Rasterizer2D.Rasterizer2D_xClipEnd) { + var11 = width + x - Rasterizer2D.Rasterizer2D_xClipEnd; + width -= var11; var9 += var11; var8 += var11; } - if (var3 > 0 && var4 > 0) { - AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var10, var7, var3, var4, var8, var9, var6); + if (width > 0 && height > 0) { + AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, pixels, color, var10, var7, width, height, var8, var9, alpha); } } diff --git a/runescape-client/src/main/java/AbstractRasterProvider.java b/runescape-client/src/main/java/AbstractRasterProvider.java index 4d6fcf99ea..d218bd3f3a 100644 --- a/runescape-client/src/main/java/AbstractRasterProvider.java +++ b/runescape-client/src/main/java/AbstractRasterProvider.java @@ -32,7 +32,7 @@ public abstract class AbstractRasterProvider { garbageValue = "-430495007" ) @Export("drawFull") - public abstract void drawFull(int var1, int var2); + public abstract void drawFull(int x, int y); @ObfuscatedName("q") @ObfuscatedSignature( @@ -40,7 +40,7 @@ public abstract class AbstractRasterProvider { garbageValue = "18" ) @Export("draw") - public abstract void draw(int var1, int var2, int var3, int var4); + public abstract void draw(int x, int y, int width, int height); @ObfuscatedName("b") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/AbstractSocket.java b/runescape-client/src/main/java/AbstractSocket.java index 0c7a6326c8..46978179ee 100644 --- a/runescape-client/src/main/java/AbstractSocket.java +++ b/runescape-client/src/main/java/AbstractSocket.java @@ -13,7 +13,7 @@ public abstract class AbstractSocket { garbageValue = "1765046516" ) @Export("isAvailable") - public abstract boolean isAvailable(int var1) throws IOException; + public abstract boolean isAvailable(int length) throws IOException; @ObfuscatedName("q") @ObfuscatedSignature( @@ -37,7 +37,7 @@ public abstract class AbstractSocket { garbageValue = "-1089665746" ) @Export("read") - public abstract int read(byte[] var1, int var2, int var3) throws IOException; + public abstract int read(byte[] dst, int dstIndex, int length) throws IOException; @ObfuscatedName("u") @ObfuscatedSignature( @@ -45,7 +45,7 @@ public abstract class AbstractSocket { garbageValue = "-86" ) @Export("write") - public abstract void write(byte[] var1, int var2, int var3) throws IOException; + public abstract void write(byte[] src, int srcIndex, int length) throws IOException; @ObfuscatedName("g") @ObfuscatedSignature( @@ -63,7 +63,7 @@ public abstract class AbstractSocket { public static void method3488(int var0) { class214.field1129 = 1; class214.field1130 = null; - class30.musicTrackArchiveId = -1; + class30.musicTrackGroupId = -1; GrandExchangeOffer.musicTrackFileId = -1; WorldMapLabel.field1039 = 0; RectangleMode.musicTrackBoolean = false; diff --git a/runescape-client/src/main/java/AbstractUserComparator.java b/runescape-client/src/main/java/AbstractUserComparator.java index 0d2b77c0d2..6071aae588 100644 --- a/runescape-client/src/main/java/AbstractUserComparator.java +++ b/runescape-client/src/main/java/AbstractUserComparator.java @@ -1,4 +1,5 @@ import java.util.Comparator; +import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -7,18 +8,20 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("AbstractUserComparator") public abstract class AbstractUserComparator implements Comparator { @ObfuscatedName("f") - Comparator field3; + @Export("nextComparator") + Comparator nextComparator; @ObfuscatedName("e") @ObfuscatedSignature( signature = "(Ljava/util/Comparator;B)V", garbageValue = "-2" ) - final void method11(Comparator var1) { - if (this.field3 == null) { - this.field3 = var1; - } else if (this.field3 instanceof AbstractUserComparator) { - ((AbstractUserComparator)this.field3).method11(var1); + @Export("addComparator") + final void addComparator(Comparator var1) { + if (this.nextComparator == null) { + this.nextComparator = var1; + } else if (this.nextComparator instanceof AbstractUserComparator) { + ((AbstractUserComparator)this.nextComparator).addComparator(var1); } } @@ -28,12 +31,12 @@ public abstract class AbstractUserComparator implements Comparator { signature = "(Ljs;Ljs;I)I", garbageValue = "-962181316" ) - protected final int method12(User var1, User var2) { - return this.field3 == null ? 0 : this.field3.compare(var1, var2); + @Export("compareUser") + protected final int compareUser(User var1, User var2) { + return this.nextComparator == null ? 0 : this.nextComparator.compare(var1, var2); } - @ObfuscatedName("equals") - public boolean method13(Object var1) { + public boolean equals(Object var1) { return super.equals(var1); } @@ -48,11 +51,11 @@ public abstract class AbstractUserComparator implements Comparator { class214.field1129 = 1; class214.field1130 = null; } else if (var0 != -1 && var0 != Client.field112 && Client.field128 != 0 && !Client.field107) { - IndexCache var1 = UserComparator3.indexCache6; + Archive var1 = UserComparator3.archive6; int var2 = Client.field128; class214.field1129 = 1; class214.field1130 = var1; - class30.musicTrackArchiveId = var0; + class30.musicTrackGroupId = var0; GrandExchangeOffer.musicTrackFileId = 0; WorldMapLabel.field1039 = var2; RectangleMode.musicTrackBoolean = false; diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java index b6ed56b3b4..6eb7f5cc76 100644 --- a/runescape-client/src/main/java/AbstractWorldMapIcon.java +++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java @@ -23,13 +23,13 @@ public abstract class AbstractWorldMapIcon { signature = "Lhu;" ) @Export("coord2") - public final TileLocation coord2; + public final Coord coord2; @ObfuscatedName("l") @ObfuscatedSignature( signature = "Lhu;" ) @Export("coord1") - public final TileLocation coord1; + public final Coord coord1; @ObfuscatedName("e") @ObfuscatedGetter( intValue = -521086143 @@ -44,7 +44,7 @@ public abstract class AbstractWorldMapIcon { @ObfuscatedSignature( signature = "(Lhu;Lhu;)V" ) - AbstractWorldMapIcon(TileLocation var1, TileLocation var2) { + AbstractWorldMapIcon(Coord var1, Coord var2) { this.coord1 = var1; this.coord2 = var2; } @@ -54,14 +54,16 @@ public abstract class AbstractWorldMapIcon { signature = "(I)I", garbageValue = "1990181988" ) - public abstract int vmethod395(); + @Export("getElement") + public abstract int getElement(); @ObfuscatedName("f") @ObfuscatedSignature( signature = "(I)Laj;", garbageValue = "1159446036" ) - abstract WorldMapLabel vmethod396(); + @Export("getLabel") + abstract WorldMapLabel getLabel(); @ObfuscatedName("q") @ObfuscatedSignature( @@ -92,7 +94,7 @@ public abstract class AbstractWorldMapIcon { garbageValue = "1150380891" ) boolean method19() { - return this.vmethod395() >= 0; + return this.getElement() >= 0; } @ObfuscatedName("b") @@ -104,7 +106,7 @@ public abstract class AbstractWorldMapIcon { if (!this.method19()) { return false; } else { - WorldMapElement var3 = ViewportMouse.getWorldMapElement(this.vmethod395()); + WorldMapElement var3 = ViewportMouse.getWorldMapElement(this.getElement()); int var4 = this.vmethod397(); int var5 = this.vmethod398(); switch(var3.field3287.field3528) { @@ -153,7 +155,7 @@ public abstract class AbstractWorldMapIcon { garbageValue = "1201712205" ) boolean method21(int var1, int var2) { - WorldMapLabel var3 = this.vmethod396(); + WorldMapLabel var3 = this.getLabel(); return var3 == null ? false : (var1 >= this.field5 - var3.width / 2 && var1 <= var3.width / 2 + this.field5 ? var2 >= this.field6 && var2 <= var3.height + this.field6 : false); } @@ -162,9 +164,9 @@ public abstract class AbstractWorldMapIcon { signature = "(Lit;Ljava/lang/String;I)V", garbageValue = "-1018878027" ) - static void method625(IndexCache var0, String var1) { - IndexCacheLoader var2 = new IndexCacheLoader(var0, var1); - Client.indexCacheLoaders.add(var2); + static void method625(Archive var0, String var1) { + ArchiveLoader var2 = new ArchiveLoader(var0, var1); + Client.archiveLoaders.add(var2); Client.field140 += var2.field408; } } diff --git a/runescape-client/src/main/java/AccessFile.java b/runescape-client/src/main/java/AccessFile.java index 2426fcb1e9..2c31c8b140 100644 --- a/runescape-client/src/main/java/AccessFile.java +++ b/runescape-client/src/main/java/AccessFile.java @@ -61,9 +61,9 @@ public final class AccessFile { @ObfuscatedName("m") @Export("seek") - final void seek(long var1) throws IOException { - this.file.seek(var1); - this.index = var1; + final void seek(long index) throws IOException { + this.file.seek(index); + this.index = index; } @ObfuscatedName("f") @@ -72,14 +72,14 @@ public final class AccessFile { garbageValue = "-86" ) @Export("write") - public final void write(byte[] var1, int var2, int var3) throws IOException { - if ((long)var3 + this.index > this.capacity) { + public final void write(byte[] src, int srcIndex, int length) throws IOException { + if ((long)length + this.index > this.capacity) { this.file.seek(this.capacity + 1L); this.file.write(1); throw new EOFException(); } else { - this.file.write(var1, var2, var3); - this.index += (long)var3; + this.file.write(src, srcIndex, length); + this.index += (long)length; } } @@ -99,9 +99,9 @@ public final class AccessFile { garbageValue = "166642884" ) @Export("closeSync") - public final void closeSync(boolean var1) throws IOException { + public final void closeSync(boolean sync) throws IOException { if (this.file != null) { - if (var1) { + if (sync) { try { this.file.getFD().sync(); } catch (SyncFailedException var3) { @@ -130,8 +130,8 @@ public final class AccessFile { garbageValue = "971670468" ) @Export("read") - public final int read(byte[] var1, int var2, int var3) throws IOException { - int var4 = this.file.read(var1, var2, var3); + public final int read(byte[] dst, int dstIndex, int length) throws IOException { + int var4 = this.file.read(dst, dstIndex, length); if (var4 > 0) { this.index += (long)var4; } diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java index 8c6154c075..12cc33ee48 100644 --- a/runescape-client/src/main/java/Actor.java +++ b/runescape-client/src/main/java/Actor.java @@ -42,8 +42,8 @@ public abstract class Actor extends Entity { @ObfuscatedGetter( intValue = -299122235 ) - @Export("idleSequence") - int idleSequence; + @Export("readySequence") + int readySequence; @ObfuscatedName("al") @ObfuscatedGetter( intValue = -831787909 @@ -66,20 +66,20 @@ public abstract class Actor extends Entity { @ObfuscatedGetter( intValue = -1598871111 ) - @Export("walkTurnSequence") - int walkTurnSequence; + @Export("walkBackSequence") + int walkBackSequence; @ObfuscatedName("ad") @ObfuscatedGetter( intValue = -568830521 ) - @Export("walkTurnLeftSequence") - int walkTurnLeftSequence; + @Export("walkLeftSequence") + int walkLeftSequence; @ObfuscatedName("ap") @ObfuscatedGetter( intValue = -257240117 ) - @Export("walkTurnRightSequence") - int walkTurnRightSequence; + @Export("walkRightSequence") + int walkRightSequence; @ObfuscatedName("as") @ObfuscatedGetter( intValue = 1708570917 @@ -318,13 +318,13 @@ public abstract class Actor extends Entity { Actor() { this.field10 = false; this.size = 1; - this.idleSequence = -1; + this.readySequence = -1; this.turnLeftSequence = -1; this.turnRightSequence = -1; this.walkSequence = -1; - this.walkTurnSequence = -1; - this.walkTurnLeftSequence = -1; - this.walkTurnRightSequence = -1; + this.walkBackSequence = -1; + this.walkLeftSequence = -1; + this.walkRightSequence = -1; this.runSequence = -1; this.overheadText = null; this.field11 = false; @@ -390,13 +390,13 @@ public abstract class Actor extends Entity { garbageValue = "-1925126781" ) @Export("addHitSplat") - final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var6) { + final void addHitSplat(int type, int value, int type2, int value2, int cycle, int cycle2) { boolean var7 = true; boolean var8 = true; int var9; for (var9 = 0; var9 < 4; ++var9) { - if (this.hitSplatCycles[var9] > var5) { + if (this.hitSplatCycles[var9] > cycle) { var7 = false; } else { var8 = false; @@ -406,8 +406,8 @@ public abstract class Actor extends Entity { var9 = -1; int var10 = -1; int var11 = 0; - if (var1 >= 0) { - HitSplatDefinition var12 = LoginScreenAnimation.getHitSplatDefinition(var1); + if (type >= 0) { + HitSplatDefinition var12 = LoginScreenAnimation.getHitSplatDefinition(type); var10 = var12.field396; var11 = var12.field387; } @@ -438,7 +438,7 @@ public abstract class Actor extends Entity { } } - if (var10 == 1 && var14 >= var2) { + if (var10 == 1 && var14 >= value) { return; } } else { @@ -449,7 +449,7 @@ public abstract class Actor extends Entity { for (var14 = 0; var14 < 4; ++var14) { byte var15 = this.hitSplatCount; this.hitSplatCount = (byte)((this.hitSplatCount + 1) % 4); - if (this.hitSplatCycles[var15] <= var5) { + if (this.hitSplatCycles[var15] <= cycle) { var9 = var15; break; } @@ -457,11 +457,11 @@ public abstract class Actor extends Entity { } if (var9 >= 0) { - this.hitSplatTypes[var9] = var1; - this.hitSplatValues[var9] = var2; - this.hitSplatTypes2[var9] = var3; - this.hitSplatValues2[var9] = var4; - this.hitSplatCycles[var9] = var5 + var11 + var6; + this.hitSplatTypes[var9] = type; + this.hitSplatValues[var9] = value; + this.hitSplatTypes2[var9] = type2; + this.hitSplatValues2[var9] = value2; + this.hitSplatCycles[var9] = cycle + var11 + cycle2; } } @@ -472,19 +472,19 @@ public abstract class Actor extends Entity { garbageValue = "27" ) @Export("addHealthBar") - final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) { - HealthBarDefinition var7 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1); + final void addHealthBar(int healthBarDefinition, int cycle, int var3, int var4, int var5, int var6) { + HealthBarDefinition var7 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)healthBarDefinition); HealthBarDefinition var8; if (var7 != null) { var8 = var7; } else { - byte[] var9 = HealthBarDefinition.field379.takeRecord(33, var1); + byte[] var9 = HealthBarDefinition.field379.takeFile(33, healthBarDefinition); var7 = new HealthBarDefinition(); if (var9 != null) { - var7.read(new Buffer(var9)); + var7.decode(new Buffer(var9)); } - HealthBarDefinition.HealthBarDefinition_cached.put(var7, (long)var1); + HealthBarDefinition.HealthBarDefinition_cached.put(var7, (long)healthBarDefinition); var8 = var7; } @@ -498,7 +498,7 @@ public abstract class Actor extends Entity { for (var13 = (HealthBar)this.healthBars.last(); var13 != null; var13 = (HealthBar)this.healthBars.previous()) { ++var12; if (var13.definition.field381 == var7.field381) { - var13.put(var2 + var4, var5, var6, var3); + var13.put(cycle + var4, var5, var6, var3); return; } @@ -520,7 +520,7 @@ public abstract class Actor extends Entity { IterableNodeDeque.IterableNodeDeque_addBefore(var13, var14); } - var13.put(var2 + var4, var5, var6, var3); + var13.put(cycle + var4, var5, var6, var3); if (var12 >= 4) { var10.remove(); } @@ -534,19 +534,19 @@ public abstract class Actor extends Entity { garbageValue = "-31198" ) @Export("removeHealthBar") - final void removeHealthBar(int var1) { - HealthBarDefinition var2 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1); + final void removeHealthBar(int healthBarDefinition) { + HealthBarDefinition var2 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)healthBarDefinition); HealthBarDefinition var3; if (var2 != null) { var3 = var2; } else { - byte[] var4 = HealthBarDefinition.field379.takeRecord(33, var1); + byte[] var4 = HealthBarDefinition.field379.takeFile(33, healthBarDefinition); var2 = new HealthBarDefinition(); if (var4 != null) { - var2.read(new Buffer(var4)); + var2.decode(new Buffer(var4)); } - HealthBarDefinition.HealthBarDefinition_cached.put(var2, (long)var1); + HealthBarDefinition.HealthBarDefinition_cached.put(var2, (long)healthBarDefinition); var3 = var2; } @@ -567,343 +567,343 @@ public abstract class Actor extends Entity { garbageValue = "493234011" ) @Export("menuAction") - static final void menuAction(int var0, int var1, int var2, int var3, String var4, String var5, int var6, int var7) { - if (var2 >= 2000) { - var2 -= 2000; + static final void menuAction(int argument1, int argument2, int opcode, int argument0, String action, String targetName, int mouseX, int mouseY) { + if (opcode >= 2000) { + opcode -= 2000; } PacketBufferNode var8; - if (var2 == 1) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + if (opcode == 1) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var8 = Interpreter.method1915(ClientPacket.field266, Client.packetWriter.isaacCipher); - var8.packetBuffer.method64(GraphicsObject.baseY + var1); + var8.packetBuffer.method64(GraphicsObject.baseY + argument2); var8.packetBuffer.writeShortLE(HealthBarDefinition.selectedItemSlot); var8.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); var8.packetBuffer.writeIntLE(ServerPacket.selectedItemWidget); - var8.packetBuffer.method64(var0 + class50.baseX); - var8.packetBuffer.writeShort(var3); + var8.packetBuffer.method64(argument1 + class50.baseX); + var8.packetBuffer.writeShort(argument0); var8.packetBuffer.writeShortLE(MenuAction.selectedItemId); Client.packetWriter.method241(var8); - } else if (var2 == 2) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + } else if (opcode == 2) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var8 = Interpreter.method1915(ClientPacket.field314, Client.packetWriter.isaacCipher); var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShort(var0 + class50.baseX); - var8.packetBuffer.method63(var3); + var8.packetBuffer.writeShort(argument1 + class50.baseX); + var8.packetBuffer.method63(argument0); var8.packetBuffer.writeIntLE16(ServerBuild.field788); var8.packetBuffer.writeShort(Client.field220); - var8.packetBuffer.writeShortLE(GraphicsObject.baseY + var1); + var8.packetBuffer.writeShortLE(GraphicsObject.baseY + argument2); Client.packetWriter.method241(var8); - } else if (var2 == 3) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + } else if (opcode == 3) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var8 = Interpreter.method1915(ClientPacket.field232, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(GraphicsObject.baseY + var1); + var8.packetBuffer.writeShort(GraphicsObject.baseY + argument2); var8.packetBuffer.method57(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method63(var3); - var8.packetBuffer.method64(var0 + class50.baseX); + var8.packetBuffer.method63(argument0); + var8.packetBuffer.method64(argument1 + class50.baseX); Client.packetWriter.method241(var8); - } else if (var2 == 4) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + } else if (opcode == 4) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var8 = Interpreter.method1915(ClientPacket.field301, Client.packetWriter.isaacCipher); var8.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.writeShort(GraphicsObject.baseY + var1); - var8.packetBuffer.writeShort(var0 + class50.baseX); + var8.packetBuffer.writeShort(argument0); + var8.packetBuffer.writeShort(GraphicsObject.baseY + argument2); + var8.packetBuffer.writeShort(argument1 + class50.baseX); Client.packetWriter.method241(var8); - } else if (var2 == 5) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + } else if (opcode == 5) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var8 = Interpreter.method1915(ClientPacket.field311, Client.packetWriter.isaacCipher); - var8.packetBuffer.method64(var0 + class50.baseX); - var8.packetBuffer.method63(var3); - var8.packetBuffer.method64(GraphicsObject.baseY + var1); + var8.packetBuffer.method64(argument1 + class50.baseX); + var8.packetBuffer.method63(argument0); + var8.packetBuffer.method64(GraphicsObject.baseY + argument2); var8.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); Client.packetWriter.method241(var8); - } else if (var2 == 6) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + } else if (opcode == 6) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var8 = Interpreter.method1915(ClientPacket.field225, Client.packetWriter.isaacCipher); var8.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method63(GraphicsObject.baseY + var1); - var8.packetBuffer.method63(var0 + class50.baseX); - var8.packetBuffer.writeShortLE(var3); + var8.packetBuffer.method63(GraphicsObject.baseY + argument2); + var8.packetBuffer.method63(argument1 + class50.baseX); + var8.packetBuffer.writeShortLE(argument0); Client.packetWriter.method241(var8); } else { PacketBufferNode var9; NPC var10; - if (var2 == 7) { - var10 = Client.npcs[var3]; + if (opcode == 7) { + var10 = Client.npcs[argument0]; if (var10 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var9 = Interpreter.method1915(ClientPacket.field245, Client.packetWriter.isaacCipher); var9.packetBuffer.method64(MenuAction.selectedItemId); var9.packetBuffer.writeShort(HealthBarDefinition.selectedItemSlot); - var9.packetBuffer.method64(var3); + var9.packetBuffer.method64(argument0); var9.packetBuffer.method56(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); var9.packetBuffer.writeInt(ServerPacket.selectedItemWidget); Client.packetWriter.method241(var9); } - } else if (var2 == 8) { - var10 = Client.npcs[var3]; + } else if (opcode == 8) { + var10 = Client.npcs[argument0]; if (var10 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var9 = Interpreter.method1915(ClientPacket.field308, Client.packetWriter.isaacCipher); - var9.packetBuffer.method64(var3); + var9.packetBuffer.method64(argument0); var9.packetBuffer.method56(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); var9.packetBuffer.writeIntLE(ServerBuild.field788); var9.packetBuffer.method63(Client.field220); Client.packetWriter.method241(var9); } - } else if (var2 == 9) { - var10 = Client.npcs[var3]; + } else if (opcode == 9) { + var10 = Client.npcs[argument0]; if (var10 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var9 = Interpreter.method1915(ClientPacket.field293, Client.packetWriter.isaacCipher); var9.packetBuffer.method56(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeShortLE(var3); + var9.packetBuffer.writeShortLE(argument0); Client.packetWriter.method241(var9); } - } else if (var2 == 10) { - var10 = Client.npcs[var3]; + } else if (opcode == 10) { + var10 = Client.npcs[argument0]; if (var10 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var9 = Interpreter.method1915(ClientPacket.field223, Client.packetWriter.isaacCipher); - var9.packetBuffer.method63(var3); + var9.packetBuffer.method63(argument0); var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); Client.packetWriter.method241(var9); } - } else if (var2 == 11) { - var10 = Client.npcs[var3]; + } else if (opcode == 11) { + var10 = Client.npcs[argument0]; if (var10 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var9 = Interpreter.method1915(ClientPacket.field255, Client.packetWriter.isaacCipher); - var9.packetBuffer.method64(var3); + var9.packetBuffer.method64(argument0); var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); Client.packetWriter.method241(var9); } - } else if (var2 == 12) { - var10 = Client.npcs[var3]; + } else if (opcode == 12) { + var10 = Client.npcs[argument0]; if (var10 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var9 = Interpreter.method1915(ClientPacket.field281, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShort(var3); + var9.packetBuffer.writeShort(argument0); var9.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); Client.packetWriter.method241(var9); } - } else if (var2 == 13) { - var10 = Client.npcs[var3]; + } else if (opcode == 13) { + var10 = Client.npcs[argument0]; if (var10 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var9 = Interpreter.method1915(ClientPacket.field253, Client.packetWriter.isaacCipher); var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method63(var3); + var9.packetBuffer.method63(argument0); Client.packetWriter.method241(var9); } } else { Player var11; - if (var2 == 14) { - var11 = Client.players[var3]; + if (opcode == 14) { + var11 = Client.players[argument0]; if (var11 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var9 = Interpreter.method1915(ClientPacket.field303, Client.packetWriter.isaacCipher); var9.packetBuffer.method64(HealthBarDefinition.selectedItemSlot); var9.packetBuffer.method57(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); var9.packetBuffer.writeIntME(ServerPacket.selectedItemWidget); - var9.packetBuffer.writeShort(var3); + var9.packetBuffer.writeShort(argument0); var9.packetBuffer.writeShort(MenuAction.selectedItemId); Client.packetWriter.method241(var9); } - } else if (var2 == 15) { - var11 = Client.players[var3]; + } else if (opcode == 15) { + var11 = Client.players[argument0]; if (var11 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var9 = Interpreter.method1915(ClientPacket.field277, Client.packetWriter.isaacCipher); var9.packetBuffer.writeIntLE16(ServerBuild.field788); var9.packetBuffer.method57(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); var9.packetBuffer.method63(Client.field220); - var9.packetBuffer.writeShort(var3); + var9.packetBuffer.writeShort(argument0); Client.packetWriter.method241(var9); } - } else if (var2 == 16) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + } else if (opcode == 16) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var8 = Interpreter.method1915(ClientPacket.field240, Client.packetWriter.isaacCipher); var8.packetBuffer.writeIntME(ServerPacket.selectedItemWidget); var8.packetBuffer.method64(MenuAction.selectedItemId); var8.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); var8.packetBuffer.writeShortLE(HealthBarDefinition.selectedItemSlot); - var8.packetBuffer.method64(var3); - var8.packetBuffer.method64(var0 + class50.baseX); - var8.packetBuffer.writeShortLE(GraphicsObject.baseY + var1); + var8.packetBuffer.method64(argument0); + var8.packetBuffer.method64(argument1 + class50.baseX); + var8.packetBuffer.writeShortLE(GraphicsObject.baseY + argument2); Client.packetWriter.method241(var8); - } else if (var2 == 17) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + } else if (opcode == 17) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var8 = Interpreter.method1915(ClientPacket.field275, Client.packetWriter.isaacCipher); var8.packetBuffer.writeIntME(ServerBuild.field788); var8.packetBuffer.writeShort(Client.field220); - var8.packetBuffer.method63(GraphicsObject.baseY + var1); - var8.packetBuffer.method63(var0 + class50.baseX); + var8.packetBuffer.method63(GraphicsObject.baseY + argument2); + var8.packetBuffer.method63(argument1 + class50.baseX); var8.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShortLE(var3); + var8.packetBuffer.writeShortLE(argument0); Client.packetWriter.method241(var8); - } else if (var2 == 18) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + } else if (opcode == 18) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var8 = Interpreter.method1915(ClientPacket.field227, Client.packetWriter.isaacCipher); - var8.packetBuffer.method64(GraphicsObject.baseY + var1); - var8.packetBuffer.writeShortLE(var3); - var8.packetBuffer.writeShortLE(var0 + class50.baseX); + var8.packetBuffer.method64(GraphicsObject.baseY + argument2); + var8.packetBuffer.writeShortLE(argument0); + var8.packetBuffer.writeShortLE(argument1 + class50.baseX); var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); Client.packetWriter.method241(var8); - } else if (var2 == 19) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + } else if (opcode == 19) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var8 = Interpreter.method1915(ClientPacket.field296, Client.packetWriter.isaacCipher); - var8.packetBuffer.method64(var3); - var8.packetBuffer.method63(var0 + class50.baseX); - var8.packetBuffer.writeShort(GraphicsObject.baseY + var1); + var8.packetBuffer.method64(argument0); + var8.packetBuffer.method63(argument1 + class50.baseX); + var8.packetBuffer.writeShort(GraphicsObject.baseY + argument2); var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); Client.packetWriter.method241(var8); - } else if (var2 == 20) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + } else if (opcode == 20) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var8 = Interpreter.method1915(ClientPacket.field228, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortLE(GraphicsObject.baseY + var1); + var8.packetBuffer.writeShortLE(GraphicsObject.baseY + argument2); var8.packetBuffer.method57(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShortLE(var0 + class50.baseX); - var8.packetBuffer.writeShortLE(var3); + var8.packetBuffer.writeShortLE(argument1 + class50.baseX); + var8.packetBuffer.writeShortLE(argument0); Client.packetWriter.method241(var8); - } else if (var2 == 21) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + } else if (opcode == 21) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var8 = Interpreter.method1915(ClientPacket.field251, Client.packetWriter.isaacCipher); - var8.packetBuffer.method63(GraphicsObject.baseY + var1); - var8.packetBuffer.writeShortLE(var3); - var8.packetBuffer.writeShort(var0 + class50.baseX); + var8.packetBuffer.method63(GraphicsObject.baseY + argument2); + var8.packetBuffer.writeShortLE(argument0); + var8.packetBuffer.writeShort(argument1 + class50.baseX); var8.packetBuffer.method57(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); Client.packetWriter.method241(var8); - } else if (var2 == 22) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + } else if (opcode == 22) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var8 = Interpreter.method1915(ClientPacket.field273, Client.packetWriter.isaacCipher); var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method64(var3); - var8.packetBuffer.method63(GraphicsObject.baseY + var1); - var8.packetBuffer.writeShort(var0 + class50.baseX); + var8.packetBuffer.method64(argument0); + var8.packetBuffer.method63(GraphicsObject.baseY + argument2); + var8.packetBuffer.writeShort(argument1 + class50.baseX); Client.packetWriter.method241(var8); - } else if (var2 == 23) { + } else if (opcode == 23) { if (Client.isMenuOpen) { class65.scene.method296(); } else { - class65.scene.menuOpen(SoundSystem.plane, var0, var1, true); + class65.scene.menuOpen(SoundSystem.plane, argument1, argument2, true); } } else { PacketBufferNode var12; Widget var13; - if (var2 == 24) { - var13 = Huffman.getWidget(var1); + if (opcode == 24) { + var13 = Huffman.getWidget(argument2); boolean var14 = true; if (var13.contentType > 0) { var14 = ViewportMouse.method2957(var13); @@ -911,15 +911,15 @@ public abstract class Actor extends Entity { if (var14) { var12 = Interpreter.method1915(ClientPacket.field291, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeInt(var1); + var12.packetBuffer.writeInt(argument2); Client.packetWriter.method241(var12); } } else { - if (var2 == 25) { - var13 = class204.getWidgetChild(var1, var0); + if (opcode == 25) { + var13 = class204.getWidgetChild(argument2, argument1); if (var13 != null) { Player.method1281(); - WorldMapDecoration.method350(var1, var0, class211.method4107(class1.getWidgetClickMask(var13)), var13.itemId); + WorldMapDecoration.method350(argument2, argument1, class211.method4107(class1.getWidgetClickMask(var13)), var13.itemId); Client.isItemSelected = 0; Client.selectedSpellActionName = class198.method3745(var13); if (Client.selectedSpellActionName == null) { @@ -936,117 +936,117 @@ public abstract class Actor extends Entity { return; } - if (var2 == 26) { + if (opcode == 26) { WorldMapLabelSize.method198(); } else { - Widget var15; - int var17; - if (var2 == 28) { + int var15; + Widget var17; + if (opcode == 28) { var8 = Interpreter.method1915(ClientPacket.field291, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); + var8.packetBuffer.writeInt(argument2); Client.packetWriter.method241(var8); - var15 = Huffman.getWidget(var1); - if (var15.cs1Instructions != null && var15.cs1Instructions[0][0] == 5) { - var17 = var15.cs1Instructions[0][1]; - Varps.Varps_main[var17] = 1 - Varps.Varps_main[var17]; - IndexCache.method4703(var17); + var17 = Huffman.getWidget(argument2); + if (var17.cs1Instructions != null && var17.cs1Instructions[0][0] == 5) { + var15 = var17.cs1Instructions[0][1]; + Varps.Varps_main[var15] = 1 - Varps.Varps_main[var15]; + Archive.method4703(var15); } - } else if (var2 == 29) { + } else if (opcode == 29) { var8 = Interpreter.method1915(ClientPacket.field291, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); + var8.packetBuffer.writeInt(argument2); Client.packetWriter.method241(var8); - var15 = Huffman.getWidget(var1); - if (var15.cs1Instructions != null && var15.cs1Instructions[0][0] == 5) { - var17 = var15.cs1Instructions[0][1]; - if (Varps.Varps_main[var17] != var15.cs1ComparisonValues[0]) { - Varps.Varps_main[var17] = var15.cs1ComparisonValues[0]; - IndexCache.method4703(var17); + var17 = Huffman.getWidget(argument2); + if (var17.cs1Instructions != null && var17.cs1Instructions[0][0] == 5) { + var15 = var17.cs1Instructions[0][1]; + if (Varps.Varps_main[var15] != var17.cs1ComparisonValues[0]) { + Varps.Varps_main[var15] = var17.cs1ComparisonValues[0]; + Archive.method4703(var15); } } - } else if (var2 == 30) { + } else if (opcode == 30) { if (Client.field127 == null) { - TilePaint.method3060(var1, var0); - Client.field127 = class204.getWidgetChild(var1, var0); + TilePaint.method3060(argument2, argument1); + Client.field127 = class204.getWidgetChild(argument2, argument1); class22.method295(Client.field127); } - } else if (var2 == 31) { + } else if (opcode == 31) { var8 = Interpreter.method1915(ClientPacket.field285, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntME(var1); + var8.packetBuffer.writeIntME(argument2); var8.packetBuffer.writeIntLE16(ServerPacket.selectedItemWidget); var8.packetBuffer.method64(HealthBarDefinition.selectedItemSlot); var8.packetBuffer.writeShortLE(MenuAction.selectedItemId); - var8.packetBuffer.writeShortLE(var0); - var8.packetBuffer.method64(var3); + var8.packetBuffer.writeShortLE(argument1); + var8.packetBuffer.method64(argument0); Client.packetWriter.method241(var8); Client.field203 = 0; - BoundaryObject.field40 = Huffman.getWidget(var1); - Client.field204 = var0; - } else if (var2 == 32) { + BoundaryObject.field40 = Huffman.getWidget(argument2); + Client.field204 = argument1; + } else if (opcode == 32) { var8 = Interpreter.method1915(ClientPacket.field224, Client.packetWriter.isaacCipher); var8.packetBuffer.writeIntME(ServerBuild.field788); - var8.packetBuffer.writeInt(var1); - var8.packetBuffer.writeShort(var0); - var8.packetBuffer.writeShortLE(var3); + var8.packetBuffer.writeInt(argument2); + var8.packetBuffer.writeShort(argument1); + var8.packetBuffer.writeShortLE(argument0); var8.packetBuffer.writeShortLE(Client.field220); Client.packetWriter.method241(var8); Client.field203 = 0; - BoundaryObject.field40 = Huffman.getWidget(var1); - Client.field204 = var0; - } else if (var2 == 33) { + BoundaryObject.field40 = Huffman.getWidget(argument2); + Client.field204 = argument1; + } else if (opcode == 33) { var8 = Interpreter.method1915(ClientPacket.field309, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortLE(var3); - var8.packetBuffer.writeIntME(var1); - var8.packetBuffer.writeShort(var0); + var8.packetBuffer.writeShortLE(argument0); + var8.packetBuffer.writeIntME(argument2); + var8.packetBuffer.writeShort(argument1); Client.packetWriter.method241(var8); Client.field203 = 0; - BoundaryObject.field40 = Huffman.getWidget(var1); - Client.field204 = var0; - } else if (var2 == 34) { + BoundaryObject.field40 = Huffman.getWidget(argument2); + Client.field204 = argument1; + } else if (opcode == 34) { var8 = Interpreter.method1915(ClientPacket.field320, Client.packetWriter.isaacCipher); - var8.packetBuffer.method63(var3); - var8.packetBuffer.writeIntLE16(var1); - var8.packetBuffer.method64(var0); + var8.packetBuffer.method63(argument0); + var8.packetBuffer.writeIntLE16(argument2); + var8.packetBuffer.method64(argument1); Client.packetWriter.method241(var8); Client.field203 = 0; - BoundaryObject.field40 = Huffman.getWidget(var1); - Client.field204 = var0; - } else if (var2 == 35) { + BoundaryObject.field40 = Huffman.getWidget(argument2); + Client.field204 = argument1; + } else if (opcode == 35) { var8 = Interpreter.method1915(ClientPacket.field294, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntLE(var1); - var8.packetBuffer.method64(var0); - var8.packetBuffer.method64(var3); + var8.packetBuffer.writeIntLE(argument2); + var8.packetBuffer.method64(argument1); + var8.packetBuffer.method64(argument0); Client.packetWriter.method241(var8); Client.field203 = 0; - BoundaryObject.field40 = Huffman.getWidget(var1); - Client.field204 = var0; - } else if (var2 == 36) { + BoundaryObject.field40 = Huffman.getWidget(argument2); + Client.field204 = argument1; + } else if (opcode == 36) { var8 = Interpreter.method1915(ClientPacket.field229, Client.packetWriter.isaacCipher); - var8.packetBuffer.method64(var3); - var8.packetBuffer.writeInt(var1); - var8.packetBuffer.method64(var0); + var8.packetBuffer.method64(argument0); + var8.packetBuffer.writeInt(argument2); + var8.packetBuffer.method64(argument1); Client.packetWriter.method241(var8); Client.field203 = 0; - BoundaryObject.field40 = Huffman.getWidget(var1); - Client.field204 = var0; - } else if (var2 == 37) { + BoundaryObject.field40 = Huffman.getWidget(argument2); + Client.field204 = argument1; + } else if (opcode == 37) { var8 = Interpreter.method1915(ClientPacket.field280, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - var8.packetBuffer.writeShort(var0); - var8.packetBuffer.writeShort(var3); + var8.packetBuffer.writeInt(argument2); + var8.packetBuffer.writeShort(argument1); + var8.packetBuffer.writeShort(argument0); Client.packetWriter.method241(var8); Client.field203 = 0; - BoundaryObject.field40 = Huffman.getWidget(var1); - Client.field204 = var0; + BoundaryObject.field40 = Huffman.getWidget(argument2); + Client.field204 = argument1; } else { - if (var2 == 38) { + if (opcode == 38) { Player.method1281(); - var13 = Huffman.getWidget(var1); + var13 = Huffman.getWidget(argument2); Client.isItemSelected = 1; - HealthBarDefinition.selectedItemSlot = var0; - ServerPacket.selectedItemWidget = var1; - MenuAction.selectedItemId = var3; + HealthBarDefinition.selectedItemSlot = argument1; + ServerPacket.selectedItemWidget = argument2; + MenuAction.selectedItemId = argument0; class22.method295(var13); - Client.selectedItemName = BufferedFile.colorStartTag(16748608) + Skills.getItemDefinition(var3).name + BufferedFile.colorStartTag(16777215); + Client.selectedItemName = BufferedFile.colorStartTag(16748608) + Skills.getItemDefinition(argument0).name + BufferedFile.colorStartTag(16777215); if (Client.selectedItemName == null) { Client.selectedItemName = "null"; } @@ -1054,174 +1054,174 @@ public abstract class Actor extends Entity { return; } - if (var2 == 39) { + if (opcode == 39) { var8 = Interpreter.method1915(ClientPacket.field268, Client.packetWriter.isaacCipher); - var8.packetBuffer.method64(var3); - var8.packetBuffer.writeIntLE16(var1); - var8.packetBuffer.writeShortLE(var0); + var8.packetBuffer.method64(argument0); + var8.packetBuffer.writeIntLE16(argument2); + var8.packetBuffer.writeShortLE(argument1); Client.packetWriter.method241(var8); Client.field203 = 0; - BoundaryObject.field40 = Huffman.getWidget(var1); - Client.field204 = var0; - } else if (var2 == 40) { + BoundaryObject.field40 = Huffman.getWidget(argument2); + Client.field204 = argument1; + } else if (opcode == 40) { var8 = Interpreter.method1915(ClientPacket.field248, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntLE16(var1); - var8.packetBuffer.writeShortLE(var0); - var8.packetBuffer.method63(var3); + var8.packetBuffer.writeIntLE16(argument2); + var8.packetBuffer.writeShortLE(argument1); + var8.packetBuffer.method63(argument0); Client.packetWriter.method241(var8); Client.field203 = 0; - BoundaryObject.field40 = Huffman.getWidget(var1); - Client.field204 = var0; - } else if (var2 == 41) { + BoundaryObject.field40 = Huffman.getWidget(argument2); + Client.field204 = argument1; + } else if (opcode == 41) { var8 = Interpreter.method1915(ClientPacket.field287, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntLE(var1); - var8.packetBuffer.method63(var0); - var8.packetBuffer.writeShort(var3); + var8.packetBuffer.writeIntLE(argument2); + var8.packetBuffer.method63(argument1); + var8.packetBuffer.writeShort(argument0); Client.packetWriter.method241(var8); Client.field203 = 0; - BoundaryObject.field40 = Huffman.getWidget(var1); - Client.field204 = var0; - } else if (var2 == 42) { + BoundaryObject.field40 = Huffman.getWidget(argument2); + Client.field204 = argument1; + } else if (opcode == 42) { var8 = Interpreter.method1915(ClientPacket.field286, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - var8.packetBuffer.method63(var0); - var8.packetBuffer.writeShort(var3); + var8.packetBuffer.writeInt(argument2); + var8.packetBuffer.method63(argument1); + var8.packetBuffer.writeShort(argument0); Client.packetWriter.method241(var8); Client.field203 = 0; - BoundaryObject.field40 = Huffman.getWidget(var1); - Client.field204 = var0; - } else if (var2 == 43) { + BoundaryObject.field40 = Huffman.getWidget(argument2); + Client.field204 = argument1; + } else if (opcode == 43) { var8 = Interpreter.method1915(ClientPacket.field254, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.writeIntME(var1); - var8.packetBuffer.writeShort(var0); + var8.packetBuffer.writeShort(argument0); + var8.packetBuffer.writeIntME(argument2); + var8.packetBuffer.writeShort(argument1); Client.packetWriter.method241(var8); Client.field203 = 0; - BoundaryObject.field40 = Huffman.getWidget(var1); - Client.field204 = var0; - } else if (var2 == 44) { - var11 = Client.players[var3]; + BoundaryObject.field40 = Huffman.getWidget(argument2); + Client.field204 = argument1; + } else if (opcode == 44) { + var11 = Client.players[argument0]; if (var11 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var9 = Interpreter.method1915(ClientPacket.field269, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShort(var3); + var9.packetBuffer.writeShort(argument0); var9.packetBuffer.method56(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); Client.packetWriter.method241(var9); } - } else if (var2 == 45) { - var11 = Client.players[var3]; + } else if (opcode == 45) { + var11 = Client.players[argument0]; if (var11 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var9 = Interpreter.method1915(ClientPacket.field278, Client.packetWriter.isaacCipher); var9.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method63(var3); + var9.packetBuffer.method63(argument0); Client.packetWriter.method241(var9); } - } else if (var2 == 46) { - var11 = Client.players[var3]; + } else if (opcode == 46) { + var11 = Client.players[argument0]; if (var11 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var9 = Interpreter.method1915(ClientPacket.field284, Client.packetWriter.isaacCipher); - var9.packetBuffer.method63(var3); + var9.packetBuffer.method63(argument0); var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); Client.packetWriter.method241(var9); } - } else if (var2 == 47) { - var11 = Client.players[var3]; + } else if (opcode == 47) { + var11 = Client.players[argument0]; if (var11 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var9 = Interpreter.method1915(ClientPacket.field249, Client.packetWriter.isaacCipher); - var9.packetBuffer.method64(var3); + var9.packetBuffer.method64(argument0); var9.packetBuffer.method56(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); Client.packetWriter.method241(var9); } - } else if (var2 == 48) { - var11 = Client.players[var3]; + } else if (opcode == 48) { + var11 = Client.players[argument0]; if (var11 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var9 = Interpreter.method1915(ClientPacket.field305, Client.packetWriter.isaacCipher); var9.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method63(var3); + var9.packetBuffer.method63(argument0); Client.packetWriter.method241(var9); } - } else if (var2 == 49) { - var11 = Client.players[var3]; + } else if (opcode == 49) { + var11 = Client.players[argument0]; if (var11 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var9 = Interpreter.method1915(ClientPacket.field315, Client.packetWriter.isaacCipher); - var9.packetBuffer.method63(var3); + var9.packetBuffer.method63(argument0); var9.packetBuffer.method57(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); Client.packetWriter.method241(var9); } - } else if (var2 == 50) { - var11 = Client.players[var3]; + } else if (opcode == 50) { + var11 = Client.players[argument0]; if (var11 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var9 = Interpreter.method1915(ClientPacket.field297, Client.packetWriter.isaacCipher); var9.packetBuffer.method57(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeShortLE(var3); + var9.packetBuffer.writeShortLE(argument0); Client.packetWriter.method241(var9); } - } else if (var2 == 51) { - var11 = Client.players[var3]; + } else if (opcode == 51) { + var11 = Client.players[argument0]; if (var11 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var9 = Interpreter.method1915(ClientPacket.field272, Client.packetWriter.isaacCipher); var9.packetBuffer.method56(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method64(var3); + var9.packetBuffer.method64(argument0); Client.packetWriter.method241(var9); } } else { label415: { - if (var2 != 57) { - if (var2 == 58) { - var13 = class204.getWidgetChild(var1, var0); + if (opcode != 57) { + if (opcode == 58) { + var13 = class204.getWidgetChild(argument2, argument1); if (var13 != null) { var9 = Interpreter.method1915(ClientPacket.field304, Client.packetWriter.isaacCipher); var9.packetBuffer.writeShortLE(Client.field220); - var9.packetBuffer.writeIntLE16(var1); + var9.packetBuffer.writeIntLE16(argument2); var9.packetBuffer.writeShortLE(Client.field157); - var9.packetBuffer.method64(var0); + var9.packetBuffer.method64(argument1); var9.packetBuffer.writeInt(ServerBuild.field788); var9.packetBuffer.method64(var13.itemId); Client.packetWriter.method241(var9); @@ -1229,39 +1229,39 @@ public abstract class Actor extends Entity { break label415; } - if (var2 == 1001) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + if (opcode == 1001) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var8 = Interpreter.method1915(ClientPacket.field316, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(var3); + var8.packetBuffer.writeShort(argument0); var8.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method63(var0 + class50.baseX); - var8.packetBuffer.method64(GraphicsObject.baseY + var1); + var8.packetBuffer.method63(argument1 + class50.baseX); + var8.packetBuffer.method64(GraphicsObject.baseY + argument2); Client.packetWriter.method241(var8); break label415; } - if (var2 == 1002) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + if (opcode == 1002) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; var8 = Interpreter.method1915(ClientPacket.field258, Client.packetWriter.isaacCipher); - var8.packetBuffer.method63(var3); + var8.packetBuffer.method63(argument0); Client.packetWriter.method241(var8); break label415; } - if (var2 == 1003) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + if (opcode == 1003) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - var10 = Client.npcs[var3]; + var10 = Client.npcs[argument0]; if (var10 != null) { NPCDefinition var16 = var10.definition; if (var16.transforms != null) { @@ -1277,44 +1277,44 @@ public abstract class Actor extends Entity { break label415; } - if (var2 == 1004) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + if (opcode == 1004) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; var8 = Interpreter.method1915(ClientPacket.field246, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortLE(var3); + var8.packetBuffer.writeShortLE(argument0); Client.packetWriter.method241(var8); break label415; } - if (var2 == 1005) { - var13 = Huffman.getWidget(var1); - if (var13 != null && var13.itemQuantities[var0] >= 100000) { - WorldMapIcon1.method219(27, "", var13.itemQuantities[var0] + " x " + Skills.getItemDefinition(var3).name); + if (opcode == 1005) { + var13 = Huffman.getWidget(argument2); + if (var13 != null && var13.itemQuantities[argument1] >= 100000) { + WorldMapIcon1.addGameMessage(27, "", var13.itemQuantities[argument1] + " x " + Skills.getItemDefinition(argument0).name); } else { var9 = Interpreter.method1915(ClientPacket.field246, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShortLE(var3); + var9.packetBuffer.writeShortLE(argument0); Client.packetWriter.method241(var9); } Client.field203 = 0; - BoundaryObject.field40 = Huffman.getWidget(var1); - Client.field204 = var0; + BoundaryObject.field40 = Huffman.getWidget(argument2); + Client.field204 = argument1; break label415; } - if (var2 != 1007) { - if (var2 == 1008 || var2 == 1011 || var2 == 1010 || var2 == 1009 || var2 == 1012) { - class60.worldMap0.menuAction(var2, var3, new TileLocation(var0), new TileLocation(var1)); + if (opcode != 1007) { + if (opcode == 1008 || opcode == 1011 || opcode == 1010 || opcode == 1009 || opcode == 1012) { + class60.worldMap0.menuAction(opcode, argument0, new Coord(argument1), new Coord(argument2)); } break label415; } } - var13 = class204.getWidgetChild(var1, var0); + var13 = class204.getWidgetChild(argument2, argument1); if (var13 != null) { - class171.method3494(var3, var1, var0, var13.itemId, var5); + class171.method3494(argument0, argument2, argument1, var13.itemId, targetName); } } } diff --git a/runescape-client/src/main/java/IndexCache.java b/runescape-client/src/main/java/Archive.java similarity index 65% rename from runescape-client/src/main/java/IndexCache.java rename to runescape-client/src/main/java/Archive.java index 20676bbfbe..11542e7c7b 100644 --- a/runescape-client/src/main/java/IndexCache.java +++ b/runescape-client/src/main/java/Archive.java @@ -6,23 +6,23 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("it") -@Implements("IndexCache") -public class IndexCache extends AbstractIndexCache { +@Implements("Archive") +public class Archive extends AbstractArchive { @ObfuscatedName("aj") - @Export("IndexCache_crc") - static CRC32 IndexCache_crc; + @Export("Archive_crc") + static CRC32 Archive_crc; @ObfuscatedName("c") @ObfuscatedSignature( signature = "Lff;" ) - @Export("indexStore") - IndexStore indexStore; + @Export("archiveDisk") + ArchiveDisk archiveDisk; @ObfuscatedName("r") @ObfuscatedSignature( signature = "Lff;" ) - @Export("referenceStore") - IndexStore referenceStore; + @Export("masterDisk") + ArchiveDisk masterDisk; @ObfuscatedName("p") @ObfuscatedGetter( intValue = -1579549759 @@ -34,20 +34,20 @@ public class IndexCache extends AbstractIndexCache { @ObfuscatedName("ag") boolean field404; @ObfuscatedName("aq") - @Export("validArchives") - volatile boolean[] validArchives; + @Export("validGroups") + volatile boolean[] validGroups; @ObfuscatedName("av") @ObfuscatedGetter( intValue = 1472870917 ) - @Export("indexReferenceCrc") - int indexReferenceCrc; + @Export("indexCrc") + int indexCrc; @ObfuscatedName("ar") @ObfuscatedGetter( intValue = -785528219 ) - @Export("indexReferenceVersion") - int indexReferenceVersion; + @Export("indexVersion") + int indexVersion; @ObfuscatedName("ac") @ObfuscatedGetter( intValue = -1884661133 @@ -57,13 +57,13 @@ public class IndexCache extends AbstractIndexCache { @ObfuscatedSignature( signature = "(Lff;Lff;IZZZ)V" ) - public IndexCache(IndexStore var1, IndexStore var2, int var3, boolean var4, boolean var5, boolean var6) { + public Archive(ArchiveDisk var1, ArchiveDisk var2, int var3, boolean var4, boolean var5, boolean var6) { super(var4, var5); this.field403 = false; this.field404 = false; this.field405 = -1; - this.indexStore = var1; - this.referenceStore = var2; + this.archiveDisk = var1; + this.masterDisk = var2; this.index = var3; this.field404 = var6; int var7 = this.index; @@ -71,10 +71,10 @@ public class IndexCache extends AbstractIndexCache { Players.NetCache_reference.index = var7 * 8 + 5; int var8 = Players.NetCache_reference.readInt(); int var9 = Players.NetCache_reference.readInt(); - this.loadIndexReference(var8, var9); + this.loadIndex(var8, var9); } else { - PacketBuffer.requestNetFile((IndexCache)null, 255, 255, 0, (byte)0, true); - NetCache.NetCache_indexCaches[var7] = this; + PacketBuffer.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); + NetCache.NetCache_archives[var7] = this; } } @@ -99,9 +99,9 @@ public class IndexCache extends AbstractIndexCache { signature = "(II)I", garbageValue = "-1809769865" ) - @Export("archiveLoadPercent") - int archiveLoadPercent(int var1) { - return super.archives[var1] != null ? 100 : (this.validArchives[var1] ? 100 : class54.method1086(this.index, var1)); + @Export("groupLoadPercent") + int groupLoadPercent(int var1) { + return super.groups[var1] != null ? 100 : (this.validGroups[var1] ? 100 : class54.method1086(this.index, var1)); } @ObfuscatedName("z") @@ -109,15 +109,15 @@ public class IndexCache extends AbstractIndexCache { signature = "(II)V", garbageValue = "-1829145107" ) - @Export("loadArchive") - void loadArchive(int var1) { - if (this.indexStore != null && this.validArchives != null && this.validArchives[var1]) { - IndexStore var2 = this.indexStore; + @Export("loadGroup") + void loadGroup(int group) { + if (this.archiveDisk != null && this.validGroups != null && this.validGroups[group]) { + ArchiveDisk var2 = this.archiveDisk; byte[] var3 = null; - NodeDeque var4 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue; - synchronized(IndexStoreActionHandler.IndexStoreActionHandler_requestQueue) { - for (IndexStoreAction var6 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.last(); var6 != null; var6 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.previous()) { - if (var6.key == (long)var1 && var2 == var6.indexStore && var6.type == 0) { + NodeDeque var4 = ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + for (ArchiveDiskAction var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var6 != null; var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { + if (var6.key == (long)group && var2 == var6.archiveDisk && var6.type == 0) { var3 = var6.data; break; } @@ -125,13 +125,13 @@ public class IndexCache extends AbstractIndexCache { } if (var3 != null) { - this.load(var2, var1, var3, true); + this.load(var2, group, var3, true); } else { - byte[] var5 = var2.read(var1); - this.load(var2, var1, var5, true); + byte[] var5 = var2.read(group); + this.load(var2, group, var5, true); } } else { - PacketBuffer.requestNetFile(this, this.index, var1, super.archiveCrcs[var1], (byte)2, true); + PacketBuffer.requestNetFile(this, this.index, group, super.groupCrcs[group], (byte)2, true); } } @@ -150,10 +150,11 @@ public class IndexCache extends AbstractIndexCache { signature = "(I)I", garbageValue = "1671499504" ) - public int method131() { + @Export("percentage") + public int percentage() { if (this.field403) { return 100; - } else if (super.archives != null) { + } else if (super.groups != null) { return 99; } else { int var1 = class54.method1086(255, this.index); @@ -170,18 +171,18 @@ public class IndexCache extends AbstractIndexCache { signature = "(III)V", garbageValue = "-1621053520" ) - @Export("loadIndexReference") - public void loadIndexReference(int var1, int var2) { - this.indexReferenceCrc = var1; - this.indexReferenceVersion = var2; - if (this.referenceStore != null) { + @Export("loadIndex") + public void loadIndex(int var1, int var2) { + this.indexCrc = var1; + this.indexVersion = var2; + if (this.masterDisk != null) { int var3 = this.index; - IndexStore var4 = this.referenceStore; + ArchiveDisk var4 = this.masterDisk; byte[] var5 = null; - NodeDeque var6 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue; - synchronized(IndexStoreActionHandler.IndexStoreActionHandler_requestQueue) { - for (IndexStoreAction var8 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.last(); var8 != null; var8 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.previous()) { - if (var8.key == (long)var3 && var4 == var8.indexStore && var8.type == 0) { + NodeDeque var6 = ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + for (ArchiveDiskAction var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var8 != null; var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { + if (var8.key == (long)var3 && var4 == var8.archiveDisk && var8.type == 0) { var5 = var8.data; break; } @@ -195,7 +196,7 @@ public class IndexCache extends AbstractIndexCache { this.load(var4, var3, var7, true); } } else { - PacketBuffer.requestNetFile(this, 255, this.index, this.indexReferenceCrc, (byte)0, true); + PacketBuffer.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); } } @@ -212,22 +213,22 @@ public class IndexCache extends AbstractIndexCache { throw new RuntimeException(); } - if (this.referenceStore != null) { - Widget.method4499(this.index, var2, this.referenceStore); + if (this.masterDisk != null) { + Widget.method4499(this.index, var2, this.masterDisk); } - this.setIndexReference(var2); + this.decodeIndex(var2); this.loadAllLocal(); } else { - var2[var2.length - 2] = (byte)(super.archiveVersions[var1] >> 8); - var2[var2.length - 1] = (byte)super.archiveVersions[var1]; - if (this.indexStore != null) { - Widget.method4499(var1, var2, this.indexStore); - this.validArchives[var1] = true; + var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8); + var2[var2.length - 1] = (byte)super.groupVersions[var1]; + if (this.archiveDisk != null) { + Widget.method4499(var1, var2, this.archiveDisk); + this.validGroups[var1] = true; } if (var4) { - super.archives[var1] = Projectile.byteArrayToObject(var2, false); + super.groups[var1] = Projectile.byteArrayToObject(var2, false); } } @@ -239,36 +240,38 @@ public class IndexCache extends AbstractIndexCache { garbageValue = "-2045340856" ) @Export("load") - void load(IndexStore var1, int var2, byte[] var3, boolean var4) { + void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { int var5; - if (var1 == this.referenceStore) { + if (var1 == this.masterDisk) { if (this.field403) { throw new RuntimeException(); - } else if (var3 == null) { - PacketBuffer.requestNetFile(this, 255, this.index, this.indexReferenceCrc, (byte)0, true); + } + + if (var3 == null) { + PacketBuffer.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); } else { - IndexCache_crc.reset(); - IndexCache_crc.update(var3, 0, var3.length); - var5 = (int)IndexCache_crc.getValue(); - if (var5 != this.indexReferenceCrc) { - PacketBuffer.requestNetFile(this, 255, this.index, this.indexReferenceCrc, (byte)0, true); + Archive_crc.reset(); + Archive_crc.update(var3, 0, var3.length); + var5 = (int)Archive_crc.getValue(); + if (var5 != this.indexCrc) { + PacketBuffer.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); } else { - Buffer var9 = new Buffer(Strings.decompressBytes(var3)); - int var7 = var9.readUnsignedByte(); + Buffer var6 = new Buffer(Strings.decompressBytes(var3)); + int var7 = var6.readUnsignedByte(); if (var7 != 5 && var7 != 6) { throw new RuntimeException(var7 + "," + this.index + "," + var2); - } else { - int var8 = 0; - if (var7 >= 6) { - var8 = var9.readInt(); - } + } - if (var8 != this.indexReferenceVersion) { - PacketBuffer.requestNetFile(this, 255, this.index, this.indexReferenceCrc, (byte)0, true); - } else { - this.setIndexReference(var3); - this.loadAllLocal(); - } + int var8 = 0; + if (var7 >= 6) { + var8 = var6.readInt(); + } + + if (var8 != this.indexVersion) { + PacketBuffer.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); + } else { + this.decodeIndex(var3); + this.loadAllLocal(); } } } @@ -278,31 +281,29 @@ public class IndexCache extends AbstractIndexCache { } if (var3 != null && var3.length > 2) { - IndexCache_crc.reset(); - IndexCache_crc.update(var3, 0, var3.length - 2); - var5 = (int)IndexCache_crc.getValue(); - int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); - if (var5 == super.archiveCrcs[var2] && var6 == super.archiveVersions[var2]) { - this.validArchives[var2] = true; + Archive_crc.reset(); + Archive_crc.update(var3, 0, var3.length - 2); + var5 = (int)Archive_crc.getValue(); + int var9 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); + if (var5 == super.groupCrcs[var2] && var9 == super.groupVersions[var2]) { + this.validGroups[var2] = true; if (var4) { - super.archives[var2] = Projectile.byteArrayToObject(var3, false); + super.groups[var2] = Projectile.byteArrayToObject(var3, false); } - } else { - this.validArchives[var2] = false; + this.validGroups[var2] = false; if (this.field404 || var4) { - PacketBuffer.requestNetFile(this, this.index, var2, super.archiveCrcs[var2], (byte)2, var4); + PacketBuffer.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); } - } } else { - this.validArchives[var2] = false; + this.validGroups[var2] = false; if (this.field404 || var4) { - PacketBuffer.requestNetFile(this, this.index, var2, super.archiveCrcs[var2], (byte)2, var4); + PacketBuffer.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); } - } } + } @ObfuscatedName("dt") @@ -312,21 +313,21 @@ public class IndexCache extends AbstractIndexCache { ) @Export("loadAllLocal") void loadAllLocal() { - this.validArchives = new boolean[super.archives.length]; + this.validGroups = new boolean[super.groups.length]; int var1; - for (var1 = 0; var1 < this.validArchives.length; ++var1) { - this.validArchives[var1] = false; + for (var1 = 0; var1 < this.validGroups.length; ++var1) { + this.validGroups[var1] = false; } - if (this.indexStore == null) { + if (this.archiveDisk == null) { this.field403 = true; } else { this.field405 = -1; - for (var1 = 0; var1 < this.validArchives.length; ++var1) { - if (super.recordCounts[var1] > 0) { - NPC.method2009(var1, this.indexStore, this); + for (var1 = 0; var1 < this.validGroups.length; ++var1) { + if (super.fileCounts[var1] > 0) { + NPC.method2009(var1, this.archiveDisk, this); this.field405 = var1; } } @@ -344,7 +345,7 @@ public class IndexCache extends AbstractIndexCache { garbageValue = "0" ) public boolean method132(int var1) { - return this.validArchives[var1]; + return this.validGroups[var1]; } @ObfuscatedName("df") @@ -367,10 +368,10 @@ public class IndexCache extends AbstractIndexCache { int var2 = 0; int var3; - for (var3 = 0; var3 < super.archives.length; ++var3) { - if (super.recordCounts[var3] > 0) { + for (var3 = 0; var3 < super.groups.length; ++var3) { + if (super.fileCounts[var3] > 0) { var1 += 100; - var2 += this.archiveLoadPercent(var3); + var2 += this.groupLoadPercent(var3); } } @@ -388,7 +389,7 @@ public class IndexCache extends AbstractIndexCache { garbageValue = "-34" ) static final void method4703(int var0) { - class12.method159(); + GrandExchangeOfferAgeComparator.method159(); for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { if (var1.obj != null) { @@ -447,7 +448,7 @@ public class IndexCache extends AbstractIndexCache { if (var3 != Client.field128) { if (Client.field128 == 0 && Client.field112 != -1) { - Login.method2076(UserComparator3.indexCache6, Client.field112, 0, var3, false); + Login.method2076(UserComparator3.archive6, Client.field112, 0, var3, false); Client.field107 = false; } else if (var3 == 0) { class214.midiPcmStream.clear(); @@ -548,6 +549,6 @@ public class IndexCache extends AbstractIndexCache { } static { - IndexCache_crc = new CRC32(); + Archive_crc = new CRC32(); } } diff --git a/runescape-client/src/main/java/ArchiveDisk.java b/runescape-client/src/main/java/ArchiveDisk.java new file mode 100644 index 0000000000..19489b851f --- /dev/null +++ b/runescape-client/src/main/java/ArchiveDisk.java @@ -0,0 +1,507 @@ +import java.io.EOFException; +import java.io.IOException; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ff") +@Implements("ArchiveDisk") +public final class ArchiveDisk { + @ObfuscatedName("m") + @Export("ArchiveDisk_buffer") + static byte[] ArchiveDisk_buffer; + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "Ldy;" + ) + @Export("datFile") + BufferedFile datFile; + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "Ldy;" + ) + @Export("idxFile") + BufferedFile idxFile; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = -1982523283 + ) + @Export("archive") + int archive; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -748616567 + ) + @Export("maxEntrySize") + int maxEntrySize; + + @ObfuscatedSignature( + signature = "(ILdy;Ldy;I)V" + ) + public ArchiveDisk(int var1, BufferedFile var2, BufferedFile var3, int var4) { + this.datFile = null; + this.idxFile = null; + this.maxEntrySize = 65000; + this.archive = var1; + this.datFile = var2; + this.idxFile = var3; + this.maxEntrySize = var4; + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(II)[B", + garbageValue = "-294587791" + ) + @Export("read") + public byte[] read(int entry) { + BufferedFile var2 = this.datFile; + synchronized(this.datFile) { + try { + byte[] var4; + Object var5; + byte[] var10000; + if (this.idxFile.length() < (long)(entry * 6 + 6)) { + var5 = null; + var4 = ((byte[])var5); + var10000 = var4; + return var10000; + } else { + this.idxFile.seek((long)(entry * 6)); + this.idxFile.read(ArchiveDisk_buffer, 0, 6); + int var6 = ((ArchiveDisk_buffer[0] & 255) << 16) + (ArchiveDisk_buffer[2] & 255) + ((ArchiveDisk_buffer[1] & 255) << 8); + int var7 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[3] & 255) << 16) + ((ArchiveDisk_buffer[4] & 255) << 8); + if (var6 < 0 || var6 > this.maxEntrySize) { + var5 = null; + var4 = ((byte[])var5); + var10000 = var4; + return var10000; + } else if (var7 <= 0 || (long)var7 > this.datFile.length() / 520L) { + var5 = null; + var4 = ((byte[])var5); + return var4; + } else { + byte[] var8 = new byte[var6]; + int var9 = 0; + int var10 = 0; + + while (var9 < var6) { + if (var7 == 0) { + var5 = null; + var4 = ((byte[])var5); + var10000 = var4; + return var10000; + } + + this.datFile.seek((long)(var7 * 520)); + int var11 = var6 - var9; + if (var11 > 512) { + var11 = 512; + } + + this.datFile.read(ArchiveDisk_buffer, 0, var11 + 8); + int var12 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); + int var13 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); + int var14 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255); + int var15 = ArchiveDisk_buffer[7] & 255; + if (var12 == entry && var10 == var13 && var15 == this.archive) { + if (var14 >= 0 && (long)var14 <= this.datFile.length() / 520L) { + for (int var16 = 0; var16 < var11; ++var16) { + var8[var9++] = ArchiveDisk_buffer[var16 + 8]; + } + + var7 = var14; + ++var10; + continue; + } + + var5 = null; + var4 = ((byte[])var5); + var10000 = var4; + return var10000; + } + + var5 = null; + var4 = ((byte[])var5); + var10000 = var4; + return var10000; + } + + var10000 = var8; + return var10000; + } + } + } catch (IOException var18) { + return null; + } + } + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "(I[BII)Z", + garbageValue = "-1750864122" + ) + @Export("write") + public boolean write(int var1, byte[] var2, int var3) { + BufferedFile var4 = this.datFile; + synchronized(this.datFile) { + if (var3 >= 0 && var3 <= this.maxEntrySize) { + boolean var6 = this.write0(var1, var2, var3, true); + if (!var6) { + var6 = this.write0(var1, var2, var3, false); + } + + return var6; + } else { + throw new IllegalArgumentException(); + } + } + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "(I[BIZI)Z", + garbageValue = "-944588642" + ) + @Export("write0") + boolean write0(int var1, byte[] var2, int var3, boolean var4) { + BufferedFile var5 = this.datFile; + synchronized(this.datFile) { + try { + int var7; + boolean var8; + boolean var10000; + if (var4) { + if (this.idxFile.length() < (long)(var1 * 6 + 6)) { + var8 = false; + var10000 = var8; + return var10000; + } + + this.idxFile.seek((long)(var1 * 6)); + this.idxFile.read(ArchiveDisk_buffer, 0, 6); + var7 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[3] & 255) << 16) + ((ArchiveDisk_buffer[4] & 255) << 8); + if (var7 <= 0 || (long)var7 > this.datFile.length() / 520L) { + var8 = false; + var10000 = var8; + return var10000; + } + } else { + var7 = (int)((this.datFile.length() + 519L) / 520L); + if (var7 == 0) { + var7 = 1; + } + } + + ArchiveDisk_buffer[0] = (byte)(var3 >> 16); + ArchiveDisk_buffer[1] = (byte)(var3 >> 8); + ArchiveDisk_buffer[2] = (byte)var3; + ArchiveDisk_buffer[3] = (byte)(var7 >> 16); + ArchiveDisk_buffer[4] = (byte)(var7 >> 8); + ArchiveDisk_buffer[5] = (byte)var7; + this.idxFile.seek((long)(var1 * 6)); + this.idxFile.write(ArchiveDisk_buffer, 0, 6); + int var10 = 0; + int var11 = 0; + + while (true) { + if (var10 < var3) { + label129: { + int var12 = 0; + int var13; + if (var4) { + this.datFile.seek((long)(var7 * 520)); + + try { + this.datFile.read(ArchiveDisk_buffer, 0, 8); + } catch (EOFException var17) { + break label129; + } + + var13 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); + int var14 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); + var12 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255); + int var15 = ArchiveDisk_buffer[7] & 255; + if (var13 != var1 || var14 != var11 || var15 != this.archive) { + var8 = false; + var10000 = var8; + return var10000; + } + + if (var12 < 0 || (long)var12 > this.datFile.length() / 520L) { + var8 = false; + var10000 = var8; + return var10000; + } + } + + if (var12 == 0) { + var4 = false; + var12 = (int)((this.datFile.length() + 519L) / 520L); + if (var12 == 0) { + ++var12; + } + + if (var7 == var12) { + ++var12; + } + } + + if (var3 - var10 <= 512) { + var12 = 0; + } + + ArchiveDisk_buffer[0] = (byte)(var1 >> 8); + ArchiveDisk_buffer[1] = (byte)var1; + ArchiveDisk_buffer[2] = (byte)(var11 >> 8); + ArchiveDisk_buffer[3] = (byte)var11; + ArchiveDisk_buffer[4] = (byte)(var12 >> 16); + ArchiveDisk_buffer[5] = (byte)(var12 >> 8); + ArchiveDisk_buffer[6] = (byte)var12; + ArchiveDisk_buffer[7] = (byte)this.archive; + this.datFile.seek((long)(var7 * 520)); + this.datFile.write(ArchiveDisk_buffer, 0, 8); + var13 = var3 - var10; + if (var13 > 512) { + var13 = 512; + } + + this.datFile.write(var2, var10, var13); + var10 += var13; + var7 = var12; + ++var11; + continue; + } + } + + var8 = true; + var10000 = var8; + return var10000; + } + } catch (IOException var18) { + return false; + } + } + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "(IIILfe;Lfy;B)Z", + garbageValue = "1" + ) + static final boolean method3585(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4) { + int var5 = var0; + int var6 = var1; + byte var7 = 64; + byte var8 = 64; + int var9 = var0 - var7; + int var10 = var1 - var8; + class178.directions[var7][var8] = 99; + class178.distances[var7][var8] = 0; + byte var11 = 0; + int var12 = 0; + class178.bufferX[var11] = var0; + int var13 = var11 + 1; + class178.bufferY[var11] = var1; + int[][] var14 = var4.flags; + + while (true) { + label241: + while (true) { + int var15; + int var16; + int var17; + int var18; + int var19; + int var20; + do { + do { + do { + label218: + do { + if (var13 == var12) { + InterfaceParent.field986 = var5; + UrlRequester.field929 = var6; + return false; + } + + var5 = class178.bufferX[var12]; + var6 = class178.bufferY[var12]; + var12 = var12 + 1 & 4095; + var15 = var5 - var9; + var16 = var6 - var10; + var17 = var5 - var4.xInset; + var18 = var6 - var4.yInset; + if (var3.vmethod3644(var2, var5, var6, var4)) { + InterfaceParent.field986 = var5; + UrlRequester.field929 = var6; + return true; + } + + var19 = class178.distances[var15][var16] + 1; + if (var15 > 0 && class178.directions[var15 - 1][var16] == 0 && (var14[var17 - 1][var18] & 19136782) == 0 && (var14[var17 - 1][var18 + var2 - 1] & 19136824) == 0) { + var20 = 1; + + while (true) { + if (var20 >= var2 - 1) { + class178.bufferX[var13] = var5 - 1; + class178.bufferY[var13] = var6; + var13 = var13 + 1 & 4095; + class178.directions[var15 - 1][var16] = 2; + class178.distances[var15 - 1][var16] = var19; + break; + } + + if ((var14[var17 - 1][var20 + var18] & 19136830) != 0) { + break; + } + + ++var20; + } + } + + if (var15 < 128 - var2 && class178.directions[var15 + 1][var16] == 0 && (var14[var17 + var2][var18] & 19136899) == 0 && (var14[var17 + var2][var18 + var2 - 1] & 19136992) == 0) { + var20 = 1; + + while (true) { + if (var20 >= var2 - 1) { + class178.bufferX[var13] = var5 + 1; + class178.bufferY[var13] = var6; + var13 = var13 + 1 & 4095; + class178.directions[var15 + 1][var16] = 8; + class178.distances[var15 + 1][var16] = var19; + break; + } + + if ((var14[var17 + var2][var18 + var20] & 19136995) != 0) { + break; + } + + ++var20; + } + } + + if (var16 > 0 && class178.directions[var15][var16 - 1] == 0 && (var14[var17][var18 - 1] & 19136782) == 0 && (var14[var17 + var2 - 1][var18 - 1] & 19136899) == 0) { + var20 = 1; + + while (true) { + if (var20 >= var2 - 1) { + class178.bufferX[var13] = var5; + class178.bufferY[var13] = var6 - 1; + var13 = var13 + 1 & 4095; + class178.directions[var15][var16 - 1] = 1; + class178.distances[var15][var16 - 1] = var19; + break; + } + + if ((var14[var20 + var17][var18 - 1] & 19136911) != 0) { + break; + } + + ++var20; + } + } + + if (var16 < 128 - var2 && class178.directions[var15][var16 + 1] == 0 && (var14[var17][var18 + var2] & 19136824) == 0 && (var14[var17 + var2 - 1][var18 + var2] & 19136992) == 0) { + var20 = 1; + + while (true) { + if (var20 >= var2 - 1) { + class178.bufferX[var13] = var5; + class178.bufferY[var13] = var6 + 1; + var13 = var13 + 1 & 4095; + class178.directions[var15][var16 + 1] = 4; + class178.distances[var15][var16 + 1] = var19; + break; + } + + if ((var14[var20 + var17][var18 + var2] & 19137016) != 0) { + break; + } + + ++var20; + } + } + + if (var15 > 0 && var16 > 0 && class178.directions[var15 - 1][var16 - 1] == 0 && (var14[var17 - 1][var18 - 1] & 19136782) == 0) { + var20 = 1; + + while (true) { + if (var20 >= var2) { + class178.bufferX[var13] = var5 - 1; + class178.bufferY[var13] = var6 - 1; + var13 = var13 + 1 & 4095; + class178.directions[var15 - 1][var16 - 1] = 3; + class178.distances[var15 - 1][var16 - 1] = var19; + break; + } + + if ((var14[var17 - 1][var20 + (var18 - 1)] & 19136830) != 0 || (var14[var20 + (var17 - 1)][var18 - 1] & 19136911) != 0) { + break; + } + + ++var20; + } + } + + if (var15 < 128 - var2 && var16 > 0 && class178.directions[var15 + 1][var16 - 1] == 0 && (var14[var17 + var2][var18 - 1] & 19136899) == 0) { + var20 = 1; + + while (true) { + if (var20 >= var2) { + class178.bufferX[var13] = var5 + 1; + class178.bufferY[var13] = var6 - 1; + var13 = var13 + 1 & 4095; + class178.directions[var15 + 1][var16 - 1] = 9; + class178.distances[var15 + 1][var16 - 1] = var19; + break; + } + + if ((var14[var17 + var2][var20 + (var18 - 1)] & 19136995) != 0 || (var14[var20 + var17][var18 - 1] & 19136911) != 0) { + break; + } + + ++var20; + } + } + + if (var15 > 0 && var16 < 128 - var2 && class178.directions[var15 - 1][var16 + 1] == 0 && (var14[var17 - 1][var18 + var2] & 19136824) == 0) { + for (var20 = 1; var20 < var2; ++var20) { + if ((var14[var17 - 1][var18 + var20] & 19136830) != 0 || (var14[var20 + (var17 - 1)][var18 + var2] & 19137016) != 0) { + continue label218; + } + } + + class178.bufferX[var13] = var5 - 1; + class178.bufferY[var13] = var6 + 1; + var13 = var13 + 1 & 4095; + class178.directions[var15 - 1][var16 + 1] = 6; + class178.distances[var15 - 1][var16 + 1] = var19; + } + } while(var15 >= 128 - var2); + } while(var16 >= 128 - var2); + } while(class178.directions[var15 + 1][var16 + 1] != 0); + } while((var14[var17 + var2][var18 + var2] & 19136992) != 0); + + for (var20 = 1; var20 < var2; ++var20) { + if ((var14[var17 + var20][var18 + var2] & 19137016) != 0 || (var14[var17 + var2][var20 + var18] & 19136995) != 0) { + continue label241; + } + } + + class178.bufferX[var13] = var5 + 1; + class178.bufferY[var13] = var6 + 1; + var13 = var13 + 1 & 4095; + class178.directions[var15 + 1][var16 + 1] = 12; + class178.distances[var15 + 1][var16 + 1] = var19; + } + } + } + + static { + ArchiveDisk_buffer = new byte[520]; + } +} diff --git a/runescape-client/src/main/java/IndexStoreAction.java b/runescape-client/src/main/java/ArchiveDiskAction.java similarity index 90% rename from runescape-client/src/main/java/IndexStoreAction.java rename to runescape-client/src/main/java/ArchiveDiskAction.java index c8b7bdd8da..ab50457c36 100644 --- a/runescape-client/src/main/java/IndexStoreAction.java +++ b/runescape-client/src/main/java/ArchiveDiskAction.java @@ -5,8 +5,8 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ik") -@Implements("IndexStoreAction") -public class IndexStoreAction extends Node { +@Implements("ArchiveDiskAction") +public class ArchiveDiskAction extends Node { @ObfuscatedName("rt") @ObfuscatedGetter( intValue = -1086790653 @@ -36,14 +36,14 @@ public class IndexStoreAction extends Node { @ObfuscatedSignature( signature = "Lff;" ) - @Export("indexStore") - IndexStore indexStore; + @Export("archiveDisk") + ArchiveDisk archiveDisk; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache") - IndexCache indexCache; + @Export("archive") + Archive archive; @ObfuscatedName("fn") @ObfuscatedSignature( @@ -94,7 +94,7 @@ public class IndexStoreAction extends Node { var5 = false; } - if (var0.movementSequence == var0.idleSequence && (var0.field22 > 25 || var5)) { + if (var0.movementSequence == var0.readySequence && (var0.field22 > 25 || var5)) { if (var0.turnLeftSequence != -1) { var0.movementSequence = var0.turnLeftSequence; } else { @@ -109,7 +109,7 @@ public class IndexStoreAction extends Node { var5 = false; } - if (var0.movementSequence == var0.idleSequence && (var0.field22 > 25 || var5)) { + if (var0.movementSequence == var0.readySequence && (var0.field22 > 25 || var5)) { if (var0.turnRightSequence != -1) { var0.movementSequence = var0.turnRightSequence; } else { diff --git a/runescape-client/src/main/java/ArchiveDiskActionHandler.java b/runescape-client/src/main/java/ArchiveDiskActionHandler.java new file mode 100644 index 0000000000..d9899dacb7 --- /dev/null +++ b/runescape-client/src/main/java/ArchiveDiskActionHandler.java @@ -0,0 +1,107 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("iv") +@Implements("ArchiveDiskActionHandler") +public class ArchiveDiskActionHandler implements Runnable { + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "Lje;" + ) + @Export("ArchiveDiskActionHandler_requestQueue") + static NodeDeque ArchiveDiskActionHandler_requestQueue; + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "Lje;" + ) + @Export("ArchiveDiskActionHandler_responseQueue") + static NodeDeque ArchiveDiskActionHandler_responseQueue; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -1282224505 + ) + static int field412; + @ObfuscatedName("w") + @Export("ArchiveDiskActionHandler_lock") + static Object ArchiveDiskActionHandler_lock; + + public void run() { + try { + while (true) { + NodeDeque var1 = ArchiveDiskActionHandler_requestQueue; + ArchiveDiskAction var2; + synchronized(ArchiveDiskActionHandler_requestQueue) { + var2 = (ArchiveDiskAction)ArchiveDiskActionHandler_requestQueue.last(); + } + + Object var3; + if (var2 != null) { + if (var2.type == 0) { + var2.archiveDisk.write((int)var2.key, var2.data, var2.data.length); + var1 = ArchiveDiskActionHandler_requestQueue; + synchronized(ArchiveDiskActionHandler_requestQueue) { + var2.remove(); + } + } else if (var2.type == 1) { + var2.data = var2.archiveDisk.read((int)var2.key); + var1 = ArchiveDiskActionHandler_requestQueue; + synchronized(ArchiveDiskActionHandler_requestQueue) { + ArchiveDiskActionHandler_responseQueue.addFirst(var2); + } + } + + var3 = ArchiveDiskActionHandler_lock; + synchronized(ArchiveDiskActionHandler_lock) { + if (field412 <= 1) { + field412 = 0; + ArchiveDiskActionHandler_lock.notifyAll(); + return; + } + + field412 = 600; + } + } else { + class203.method4010(100L); + var3 = ArchiveDiskActionHandler_lock; + synchronized(ArchiveDiskActionHandler_lock) { + if (field412 <= 1) { + field412 = 0; + ArchiveDiskActionHandler_lock.notifyAll(); + return; + } + + --field412; + } + } + } + } catch (Exception var14) { + NPCDefinition.sendStackTrace((String)null, var14); + } + } + + @ObfuscatedName("ky") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;B)V", + garbageValue = "67" + ) + @Export("clanKickUser") + static final void clanKickUser(String var0) { + if (PacketWriter.clanChat != null) { + PacketBufferNode var1 = Interpreter.method1915(ClientPacket.field235, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(WorldMapRegion.stringCp1252NullTerminatedByteSize(var0)); + var1.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.method241(var1); + } + + } + + static { + ArchiveDiskActionHandler_requestQueue = new NodeDeque(); + ArchiveDiskActionHandler_responseQueue = new NodeDeque(); + field412 = 0; + ArchiveDiskActionHandler_lock = new Object(); + } +} diff --git a/runescape-client/src/main/java/ArchiveLoader.java b/runescape-client/src/main/java/ArchiveLoader.java new file mode 100644 index 0000000000..03c033e450 --- /dev/null +++ b/runescape-client/src/main/java/ArchiveLoader.java @@ -0,0 +1,709 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("bd") +@Implements("ArchiveLoader") +public class ArchiveLoader { + @ObfuscatedName("pf") + @ObfuscatedSignature( + signature = "Lko;" + ) + static class310 field512; + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "Llq;" + ) + @Export("titlebuttonSprite") + static IndexedSprite titlebuttonSprite; + @ObfuscatedName("x") + public static short[][] field406; + @ObfuscatedName("er") + @ObfuscatedGetter( + intValue = 636454135 + ) + static int field407; + @ObfuscatedName("gw") + @Export("regionMapArchiveIds") + static int[] regionMapArchiveIds; + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "Lit;" + ) + @Export("archive") + final Archive archive; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 1459455501 + ) + final int field408; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = 782003089 + ) + int field409; + + @ObfuscatedSignature( + signature = "(Lit;Ljava/lang/String;)V" + ) + ArchiveLoader(Archive var1, String var2) { + this.field409 = 0; + this.archive = var1; + this.field408 = var1.method5(); + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(I)Z", + garbageValue = "1352221725" + ) + boolean method134() { + this.field409 = 0; + + for (int var1 = 0; var1 < this.field408; ++var1) { + if (!this.archive.method133(var1) || this.archive.method132(var1)) { + ++this.field409; + } + } + + return this.field409 >= this.field408; + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(Lkk;Lkk;Lkk;I)V", + garbageValue = "839403460" + ) + @Export("drawTitle") + static void drawTitle(Font var0, Font var1, Font var2) { + Login.xPadding = (SoundCache.canvasWidth - 765) / 2; + Login.loginBoxX = Login.xPadding + 202; + Varps.loginBoxCenter = Login.loginBoxX + 180; + int var3; + int var4; + int var5; + byte var6; + int var7; + int var8; + int var9; + int var10; + boolean var11; + if (Login.worldSelectOpen) { + if (class30.worldSelectBackSprites == null) { + class30.worldSelectBackSprites = class2.method20(WorldMapSection3.archive8, "sl_back", ""); + } + + Archive var12; + int var13; + int var14; + IndexedSprite[] var15; + if (Frames.worldSelectFlagSprites == null) { + var12 = WorldMapSection3.archive8; + var14 = var12.getGroupId("sl_flags"); + var13 = var12.getFileId(var14, ""); + if (!SpriteMask.loadSprite(var12, var14, var13)) { + var15 = null; + } else { + var15 = WorldMapLabel.createIndexedSpriteArray(); + } + + Frames.worldSelectFlagSprites = var15; + } + + if (AttackOption.worldSelectArrows == null) { + var12 = WorldMapSection3.archive8; + var14 = var12.getGroupId("sl_arrows"); + var13 = var12.getFileId(var14, ""); + if (!SpriteMask.loadSprite(var12, var14, var13)) { + var15 = null; + } else { + var15 = WorldMapLabel.createIndexedSpriteArray(); + } + + AttackOption.worldSelectArrows = var15; + } + + if (UrlRequest.worldSelectStars == null) { + var12 = WorldMapSection3.archive8; + var14 = var12.getGroupId("sl_stars"); + var13 = var12.getFileId(var14, ""); + if (!SpriteMask.loadSprite(var12, var14, var13)) { + var15 = null; + } else { + var15 = WorldMapLabel.createIndexedSpriteArray(); + } + + UrlRequest.worldSelectStars = var15; + } + + if (SecureRandomFuture.worldSelectLeftSprite == null) { + SecureRandomFuture.worldSelectLeftSprite = MenuAction.loadIndexedSpriteByName(WorldMapSection3.archive8, "leftarrow", ""); + } + + if (NetSocket.worldSelectRightSprite == null) { + NetSocket.worldSelectRightSprite = MenuAction.loadIndexedSpriteByName(WorldMapSection3.archive8, "rightarrow", ""); + } + + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); + Rasterizer2D.drawGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); + Rasterizer2D.drawGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); + var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); + if (UrlRequest.worldSelectStars != null) { + UrlRequest.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); + var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); + UrlRequest.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); + var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); + } + + if (AttackOption.worldSelectArrows != null) { + var10 = Login.xPadding + 280; + if (World.sortOption1[0] == 0 && World.sortOption2[0] == 0) { + AttackOption.worldSelectArrows[2].drawAt(var10, 4); + } else { + AttackOption.worldSelectArrows[0].drawAt(var10, 4); + } + + if (World.sortOption1[0] == 0 && World.sortOption2[0] == 1) { + AttackOption.worldSelectArrows[3].drawAt(var10 + 15, 4); + } else { + AttackOption.worldSelectArrows[1].drawAt(var10 + 15, 4); + } + + var0.draw("World", var10 + 32, 17, 16777215, -1); + var7 = Login.xPadding + 390; + if (World.sortOption1[0] == 1 && World.sortOption2[0] == 0) { + AttackOption.worldSelectArrows[2].drawAt(var7, 4); + } else { + AttackOption.worldSelectArrows[0].drawAt(var7, 4); + } + + if (World.sortOption1[0] == 1 && World.sortOption2[0] == 1) { + AttackOption.worldSelectArrows[3].drawAt(var7 + 15, 4); + } else { + AttackOption.worldSelectArrows[1].drawAt(var7 + 15, 4); + } + + var0.draw("Players", var7 + 32, 17, 16777215, -1); + var14 = Login.xPadding + 500; + if (World.sortOption1[0] == 2 && World.sortOption2[0] == 0) { + AttackOption.worldSelectArrows[2].drawAt(var14, 4); + } else { + AttackOption.worldSelectArrows[0].drawAt(var14, 4); + } + + if (World.sortOption1[0] == 2 && World.sortOption2[0] == 1) { + AttackOption.worldSelectArrows[3].drawAt(var14 + 15, 4); + } else { + AttackOption.worldSelectArrows[1].drawAt(var14 + 15, 4); + } + + var0.draw("Location", var14 + 32, 17, 16777215, -1); + var13 = Login.xPadding + 610; + if (World.sortOption1[0] == 3 && World.sortOption2[0] == 0) { + AttackOption.worldSelectArrows[2].drawAt(var13, 4); + } else { + AttackOption.worldSelectArrows[0].drawAt(var13, 4); + } + + if (World.sortOption1[0] == 3 && World.sortOption2[0] == 1) { + AttackOption.worldSelectArrows[3].drawAt(var13 + 15, 4); + } else { + AttackOption.worldSelectArrows[1].drawAt(var13 + 15, 4); + } + + var0.draw("Type", var13 + 32, 17, 16777215, -1); + } + + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); + var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); + Login.hoveredWorldIndex = -1; + if (class30.worldSelectBackSprites != null) { + var6 = 88; + byte var16 = 19; + var14 = 765 / (var6 + 1) - 1; + var13 = 480 / (var16 + 1); + + while (true) { + var8 = var13; + var9 = var14; + if (var13 * (var14 - 1) >= World.worldsCount) { + --var14; + } + + if (var14 * (var13 - 1) >= World.worldsCount) { + --var13; + } + + if (var14 * (var13 - 1) >= World.worldsCount) { + --var13; + } + + if (var13 == var8 && var14 == var9) { + var8 = (765 - var6 * var14) / (var14 + 1); + if (var8 > 5) { + var8 = 5; + } + + var9 = (480 - var16 * var13) / (var13 + 1); + if (var9 > 5) { + var9 = 5; + } + + var3 = (765 - var14 * var6 - var8 * (var14 - 1)) / 2; + int var17 = (480 - var13 * var16 - var9 * (var13 - 1)) / 2; + var4 = (var13 + World.worldsCount - 1) / var13; + Login.worldSelectPagesCount = var4 - var14; + if (SecureRandomFuture.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { + SecureRandomFuture.worldSelectLeftSprite.drawAt(8, Huffman.canvasHeight / 2 - SecureRandomFuture.worldSelectLeftSprite.subHeight / 2); + } + + if (NetSocket.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { + NetSocket.worldSelectRightSprite.drawAt(SoundCache.canvasWidth - NetSocket.worldSelectRightSprite.subWidth - 8, Huffman.canvasHeight / 2 - NetSocket.worldSelectRightSprite.subHeight / 2); + } + + int var18 = var17 + 23; + int var19 = var3 + Login.xPadding; + int var20 = 0; + var11 = false; + int var21 = Login.worldSelectPage; + + int var22; + for (var22 = var13 * var21; var22 < World.worldsCount && var21 - Login.worldSelectPage < var14; ++var22) { + World var23 = ItemContainer.worlds[var22]; + boolean var24 = true; + String var25 = Integer.toString(var23.population); + if (var23.population == -1) { + var25 = "OFF"; + var24 = false; + } else if (var23.population > 1980) { + var25 = "FULL"; + var24 = false; + } + + int var26 = 0; + byte var27; + if (var23.isBeta()) { + if (var23.isMembersOnly()) { + var27 = 7; + } else { + var27 = 6; + } + } else if (var23.isDeadman()) { + var26 = 16711680; + if (var23.isMembersOnly()) { + var27 = 5; + } else { + var27 = 4; + } + } else if (var23.isPvp()) { + if (var23.isMembersOnly()) { + var27 = 3; + } else { + var27 = 2; + } + } else if (var23.isMembersOnly()) { + var27 = 1; + } else { + var27 = 0; + } + + if (MouseHandler.MouseHandler_x >= var19 && MouseHandler.MouseHandler_y >= var18 && MouseHandler.MouseHandler_x < var19 + var6 && MouseHandler.MouseHandler_y < var16 + var18 && var24) { + Login.hoveredWorldIndex = var22; + class30.worldSelectBackSprites[var27].drawAtTransOverlay(var19, var18, 128, 16777215); + var11 = true; + } else { + class30.worldSelectBackSprites[var27].drawAt(var19, var18); + } + + if (Frames.worldSelectFlagSprites != null) { + Frames.worldSelectFlagSprites[(var23.isMembersOnly() ? 8 : 0) + var23.location].drawAt(var19 + 29, var18); + } + + var0.drawCentered(Integer.toString(var23.id), var19 + 15, var16 / 2 + var18 + 5, var26, -1); + var1.drawCentered(var25, var19 + 60, var16 / 2 + var18 + 5, 268435455, -1); + var18 = var18 + var9 + var16; + ++var20; + if (var20 >= var13) { + var18 = var17 + 23; + var19 = var19 + var6 + var8; + var20 = 0; + ++var21; + } + } + + if (var11) { + var22 = var1.stringWidth(ItemContainer.worlds[Login.hoveredWorldIndex].activity) + 6; + int var44 = var1.ascent + 8; + var5 = MouseHandler.MouseHandler_y + 25; + if (var44 + var5 > 480) { + var5 = MouseHandler.MouseHandler_y - 25 - var44; + } + + Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var22 / 2, var5, var22, var44, 16777120); + Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var22 / 2, var5, var22, var44, 0); + var1.drawCentered(ItemContainer.worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var5 + var1.ascent + 4, 0, -1); + } + break; + } + } + } + + class197.rasterProvider.drawFull(0, 0); + } else { + Login.leftTitleSprite.drawAt(Login.xPadding, 0); + Fonts.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + WorldMapSectionType.logoSprite.drawAt(Login.xPadding + 382 - WorldMapSectionType.logoSprite.subWidth / 2, 18); + if (Client.gameState == 0 || Client.gameState == 5) { + var6 = 20; + var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var6, 16777215, -1); + var7 = 253 - var6; + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var7, 304, 34, 9179409); + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var7 + 1, 302, 32, 0); + Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var7 + 2, Login.Login_loadingPercent * 3, 30, 9179409); + Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150 + Login.Login_loadingPercent * 3, var7 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); + var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var6, 16777215, -1); + } + + String var28; + String var29; + short var30; + String var31; + String var32; + String var33; + short var34; + if (Client.gameState == 20) { + Login.titleboxSprite.drawAt(Login.loginBoxX + 180 - Login.titleboxSprite.subWidth / 2, 271 - Login.titleboxSprite.subHeight / 2); + var30 = 201; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var30, 16776960, 0); + var10 = var30 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var10, 16776960, 0); + var10 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var10, 16776960, 0); + var10 += 15; + var10 += 7; + if (Login.loginIndex != 4) { + var0.draw("Login: ", Login.loginBoxX + 180 - 110, var10, 16777215, 0); + var34 = 200; + if (ReflectionCheck.clientPreferences.hideUsername) { + var29 = Login.Login_username; + var28 = class168.method3450('*', var29.length()); + var31 = var28; + } else { + var31 = Login.Login_username; + } + + for (var31 = var31; var0.stringWidth(var31) > var34; var31 = var31.substring(0, var31.length() - 1)) { + } + + var0.draw(AbstractFont.escapeBrackets(var31), Login.loginBoxX + 180 - 70, var10, 16777215, 0); + var10 += 15; + var29 = "Password: "; + var32 = Login.Login_password; + var33 = class168.method3450('*', var32.length()); + var0.draw(var29 + var33, Login.loginBoxX + 180 - 108, var10, 16777215, 0); + var10 += 15; + } + } + + if (Client.gameState == 10 || Client.gameState == 11) { + Login.titleboxSprite.drawAt(Login.loginBoxX, 171); + short var35; + if (Login.loginIndex == 0) { + var30 = 251; + var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var30, 16776960, 0); + var10 = var30 + 30; + var7 = Login.loginBoxX + 180 - 80; + var35 = 291; + titlebuttonSprite.drawAt(var7 - 73, var35 - 20); + var0.drawLines("New User", var7 - 73, var35 - 20, 144, 40, 16777215, 0, 1, 1, 0); + var7 = Login.loginBoxX + 180 + 80; + titlebuttonSprite.drawAt(var7 - 73, var35 - 20); + var0.drawLines("Existing User", var7 - 73, var35 - 20, 144, 40, 16777215, 0, 1, 1, 0); + } else if (Login.loginIndex == 1) { + var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); + var30 = 236; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var30, 16777215, 0); + var10 = var30 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var10, 16777215, 0); + var10 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var10, 16777215, 0); + var10 += 15; + var7 = Login.loginBoxX + 180 - 80; + var35 = 321; + titlebuttonSprite.drawAt(var7 - 73, var35 - 20); + var0.drawCentered("Continue", var7, var35 + 5, 16777215, 0); + var7 = Login.loginBoxX + 180 + 80; + titlebuttonSprite.drawAt(var7 - 73, var35 - 20); + var0.drawCentered("Cancel", var7, var35 + 5, 16777215, 0); + } else { + IndexedSprite var42; + if (Login.loginIndex == 2) { + var30 = 201; + var0.drawCentered(Login.Login_response1, Varps.loginBoxCenter, var30, 16776960, 0); + var10 = var30 + 15; + var0.drawCentered(Login.Login_response2, Varps.loginBoxCenter, var10, 16776960, 0); + var10 += 15; + var0.drawCentered(Login.Login_response3, Varps.loginBoxCenter, var10, 16776960, 0); + var10 += 15; + var10 += 7; + var0.draw("Login: ", Varps.loginBoxCenter - 110, var10, 16777215, 0); + var34 = 200; + if (ReflectionCheck.clientPreferences.hideUsername) { + var29 = Login.Login_username; + var28 = class168.method3450('*', var29.length()); + var31 = var28; + } else { + var31 = Login.Login_username; + } + + for (var31 = var31; var0.stringWidth(var31) > var34; var31 = var31.substring(1)) { + } + + var0.draw(AbstractFont.escapeBrackets(var31) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? BufferedFile.colorStartTag(16776960) + "|" : ""), Varps.loginBoxCenter - 70, var10, 16777215, 0); + var10 += 15; + var29 = "Password: "; + var32 = Login.Login_password; + var33 = class168.method3450('*', var32.length()); + var0.draw(var29 + var33 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? BufferedFile.colorStartTag(16776960) + "|" : ""), Varps.loginBoxCenter - 108, var10, 16777215, 0); + var10 += 15; + var30 = 277; + var4 = Varps.loginBoxCenter + -117; + boolean var40 = Client.Login_isUsernameRemembered; + var11 = Login.field468; + var42 = var40 ? (var11 ? KeyHandler.options_buttons_6Sprite : class308.options_buttons_2Sprite) : (var11 ? GraphicsObject.options_buttons_4Sprite : Login.options_buttons_0Sprite); + var42.drawAt(var4, var30); + var4 = var4 + var42.subWidth + 5; + var1.draw("Remember username", var4, var30 + 13, 16776960, 0); + var4 = Varps.loginBoxCenter + 24; + boolean var47 = ReflectionCheck.clientPreferences.hideUsername; + boolean var45 = Login.field469; + IndexedSprite var48 = var47 ? (var45 ? KeyHandler.options_buttons_6Sprite : class308.options_buttons_2Sprite) : (var45 ? GraphicsObject.options_buttons_4Sprite : Login.options_buttons_0Sprite); + var48.drawAt(var4, var30); + var4 = var4 + var48.subWidth + 5; + var1.draw("Hide username", var4, var30 + 13, 16776960, 0); + var10 = var30 + 15; + var5 = Varps.loginBoxCenter - 80; + short var49 = 321; + titlebuttonSprite.drawAt(var5 - 73, var49 - 20); + var0.drawCentered("Login", var5, var49 + 5, 16777215, 0); + var5 = Varps.loginBoxCenter + 80; + titlebuttonSprite.drawAt(var5 - 73, var49 - 20); + var0.drawCentered("Cancel", var5, var49 + 5, 16777215, 0); + var30 = 357; + switch(Login.field467) { + case 2: + AttackOption.field31 = "Having trouble logging in?"; + break; + default: + AttackOption.field31 = "Can't login? Click here."; + } + + TilePaint.field907 = new Bounds(Varps.loginBoxCenter, var30, var1.stringWidth(AttackOption.field31), 11); + UrlRequester.field930 = new Bounds(Varps.loginBoxCenter, var30, var1.stringWidth("Still having trouble logging in?"), 11); + var1.drawCentered(AttackOption.field31, Varps.loginBoxCenter, var30, 16777215, 0); + } else if (Login.loginIndex == 3) { + var30 = 201; + var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var30, 16776960, 0); + var10 = var30 + 20; + var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var10, 16776960, 0); + var10 += 15; + var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var10, 16776960, 0); + var10 += 15; + var7 = Login.loginBoxX + 180; + var35 = 276; + titlebuttonSprite.drawAt(var7 - 73, var35 - 20); + var2.drawCentered("Try again", var7, var35 + 5, 16777215, 0); + var7 = Login.loginBoxX + 180; + var35 = 326; + titlebuttonSprite.drawAt(var7 - 73, var35 - 20); + var2.drawCentered("Forgotten password?", var7, var35 + 5, 16777215, 0); + } else { + String var36; + if (Login.loginIndex == 4) { + var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); + var30 = 236; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var30, 16777215, 0); + var10 = var30 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var10, 16777215, 0); + var10 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var10, 16777215, 0); + var10 += 15; + var36 = "PIN: "; + var28 = Login.otp; + var31 = class168.method3450('*', var28.length()); + var0.draw(var36 + var31 + (Client.cycle % 40 < 20 ? BufferedFile.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var10, 16777215, 0); + var10 -= 8; + var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var10, 16776960, 0); + var10 += 15; + var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var10, 16776960, 0); + var9 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15; + var3 = var10 - var0.ascent; + if (Login.field470) { + var42 = class308.options_buttons_2Sprite; + } else { + var42 = Login.options_buttons_0Sprite; + } + + var42.drawAt(var9, var3); + var10 += 15; + var4 = Login.loginBoxX + 180 - 80; + short var46 = 321; + titlebuttonSprite.drawAt(var4 - 73, var46 - 20); + var0.drawCentered("Continue", var4, var46 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180 + 80; + titlebuttonSprite.drawAt(var4 - 73, var46 - 20); + var0.drawCentered("Cancel", var4, var46 + 5, 16777215, 0); + var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var46 + 36, 255, 0); + } else { + short var37; + if (Login.loginIndex != 5) { + if (Login.loginIndex == 6) { + var30 = 201; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var30, 16776960, 0); + var10 = var30 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var10, 16776960, 0); + var10 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var10, 16776960, 0); + var10 += 15; + var7 = Login.loginBoxX + 180; + var35 = 321; + titlebuttonSprite.drawAt(var7 - 73, var35 - 20); + var0.drawCentered("Back", var7, var35 + 5, 16777215, 0); + } else if (Login.loginIndex == 7) { + var30 = 216; + var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var30, 16776960, 0); + var10 = var30 + 15; + var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var10, 16776960, 0); + var10 += 15; + var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var10, 16776960, 0); + var10 += 15; + var7 = Login.loginBoxX + 180 - 80; + var35 = 321; + titlebuttonSprite.drawAt(var7 - 73, var35 - 20); + var0.drawCentered("Set Date of Birth", var7, var35 + 5, 16777215, 0); + var7 = Login.loginBoxX + 180 + 80; + titlebuttonSprite.drawAt(var7 - 73, var35 - 20); + var0.drawCentered("Back", var7, var35 + 5, 16777215, 0); + } else if (Login.loginIndex == 8) { + var30 = 216; + var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var30, 16776960, 0); + var10 = var30 + 15; + var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var10, 16776960, 0); + var10 += 15; + var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var10, 16776960, 0); + var10 += 15; + var7 = Login.loginBoxX + 180 - 80; + var35 = 321; + titlebuttonSprite.drawAt(var7 - 73, var35 - 20); + var0.drawCentered("Privacy Policy", var7, var35 + 5, 16777215, 0); + var7 = Login.loginBoxX + 180 + 80; + titlebuttonSprite.drawAt(var7 - 73, var35 - 20); + var0.drawCentered("Back", var7, var35 + 5, 16777215, 0); + } else if (Login.loginIndex == 12) { + var30 = 201; + String var43 = ""; + var36 = ""; + var31 = ""; + switch(Login.field466) { + case 0: + var43 = "Your account has been disabled."; + var36 = Strings.field880; + var31 = ""; + break; + case 1: + var43 = "Account locked as we suspect it has been stolen."; + var36 = Strings.field881; + var31 = ""; + break; + default: + MouseHandler.method1084(false); + } + + var0.drawCentered(var43, Login.loginBoxX + 180, var30, 16776960, 0); + var10 = var30 + 15; + var2.drawCentered(var36, Login.loginBoxX + 180, var10, 16776960, 0); + var10 += 15; + var2.drawCentered(var31, Login.loginBoxX + 180, var10, 16776960, 0); + var10 += 15; + var8 = Login.loginBoxX + 180; + var37 = 276; + titlebuttonSprite.drawAt(var8 - 73, var37 - 20); + var0.drawCentered("Support Page", var8, var37 + 5, 16777215, 0); + var8 = Login.loginBoxX + 180; + var37 = 326; + titlebuttonSprite.drawAt(var8 - 73, var37 - 20); + var0.drawCentered("Back", var8, var37 + 5, 16777215, 0); + } + } else { + var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); + var30 = 221; + var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var30, 16776960, 0); + var10 = var30 + 15; + var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var10, 16776960, 0); + var10 += 15; + var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var10, 16776960, 0); + var10 += 15; + var10 += 14; + var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var10, 16777215, 0); + var34 = 174; + if (ReflectionCheck.clientPreferences.hideUsername) { + var29 = Login.Login_username; + var28 = class168.method3450('*', var29.length()); + var31 = var28; + } else { + var31 = Login.Login_username; + } + + for (var31 = var31; var0.stringWidth(var31) > var34; var31 = var31.substring(1)) { + } + + var0.draw(AbstractFont.escapeBrackets(var31) + (Client.cycle % 40 < 20 ? BufferedFile.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var10, 16777215, 0); + var10 += 15; + var8 = Login.loginBoxX + 180 - 80; + var37 = 321; + titlebuttonSprite.drawAt(var8 - 73, var37 - 20); + var0.drawCentered("Recover", var8, var37 + 5, 16777215, 0); + var8 = Login.loginBoxX + 180 + 80; + titlebuttonSprite.drawAt(var8 - 73, var37 - 20); + var0.drawCentered("Back", var8, var37 + 5, 16777215, 0); + var37 = 356; + var1.drawCentered("Still having trouble logging in?", Varps.loginBoxCenter, var37, 268435455, 0); + } + } + } + } + } + + if (Client.gameState >= 10) { + int[] var38 = new int[4]; + Rasterizer2D.Rasterizer2D_getClipArray(var38); + Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, Huffman.canvasHeight); + class16.loginScreenRunesAnimation.method1782(Login.xPadding - 22, Client.cycle); + class16.loginScreenRunesAnimation.method1782(Login.xPadding + 22 + 765 - 128, Client.cycle); + Rasterizer2D.Rasterizer2D_setClipArray(var38); + } + + KeyHandler.title_muteSprite[ReflectionCheck.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); + if (Client.gameState > 5 && Client.language == 0) { + if (class277.field1144 != null) { + var10 = Login.xPadding + 5; + var34 = 463; + byte var39 = 100; + byte var41 = 35; + class277.field1144.drawAt(var10, var34); + var0.drawCentered("World " + Client.worldId, var39 / 2 + var10, var41 / 2 + var34 - 2, 16777215, 0); + if (FriendLoginUpdate.field356 != null) { + var1.drawCentered("Loading...", var39 / 2 + var10, var41 / 2 + var34 + 12, 16777215, 0); + } else { + var1.drawCentered("Click to switch", var39 / 2 + var10, var41 / 2 + var34 + 12, 16777215, 0); + } + } else { + class277.field1144 = MenuAction.loadIndexedSpriteByName(WorldMapSection3.archive8, "sl_button", ""); + } + } + } + + } +} diff --git a/runescape-client/src/main/java/AttackOption.java b/runescape-client/src/main/java/AttackOption.java index 2f393def77..207673d24a 100644 --- a/runescape-client/src/main/java/AttackOption.java +++ b/runescape-client/src/main/java/AttackOption.java @@ -81,7 +81,7 @@ public enum AttackOption implements Enumerated { signature = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;II)I", garbageValue = "-189314181" ) - public static int method2033(CharSequence var0, CharSequence var1, int var2) { + public static int method2033(CharSequence var0, CharSequence var1, int language) { int var3 = var0.length(); int var4 = var1.length(); int var5 = 0; @@ -146,13 +146,13 @@ public enum AttackOption implements Enumerated { } var8 = var12; - var9 = class12.method155(var9, var2); - var14 = class12.method155(var14, var2); + var9 = GrandExchangeOfferAgeComparator.method155(var9, language); + var14 = GrandExchangeOfferAgeComparator.method155(var14, language); if (var9 != var14 && Character.toUpperCase(var9) != Character.toUpperCase(var14)) { var9 = Character.toLowerCase(var9); var14 = Character.toLowerCase(var14); if (var14 != var9) { - return CollisionMap.method3631(var9, var2) - CollisionMap.method3631(var14, var2); + return CollisionMap.method3631(var9, language) - CollisionMap.method3631(var14, language); } } } @@ -168,7 +168,7 @@ public enum AttackOption implements Enumerated { var19 = Character.toLowerCase(var19); var18 = Character.toLowerCase(var18); if (var19 != var18) { - return CollisionMap.method3631(var19, var2) - CollisionMap.method3631(var18, var2); + return CollisionMap.method3631(var19, language) - CollisionMap.method3631(var18, language); } } } @@ -181,7 +181,7 @@ public enum AttackOption implements Enumerated { var18 = var0.charAt(var20); char var13 = var1.charAt(var20); if (var18 != var13) { - return CollisionMap.method3631(var18, var2) - CollisionMap.method3631(var13, var2); + return CollisionMap.method3631(var18, language) - CollisionMap.method3631(var13, language); } } diff --git a/runescape-client/src/main/java/AudioFilter.java b/runescape-client/src/main/java/AudioFilter.java index a1a4b514f1..db956f6e44 100644 --- a/runescape-client/src/main/java/AudioFilter.java +++ b/runescape-client/src/main/java/AudioFilter.java @@ -60,35 +60,35 @@ public class AudioFilter { field32[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method25(var1, 0, var2)); field32[var1][1] = var3 * var3; - float[] var10000; - int var4; - for (var4 = 1; var4 < this.field36[var1]; ++var4) { - var3 = this.method24(var1, var4, var2); - float var5 = -2.0F * var3 * (float)Math.cos((double)this.method25(var1, var4, var2)); - float var6 = var3 * var3; - field32[var1][var4 * 2 + 1] = field32[var1][var4 * 2 - 1] * var6; - field32[var1][var4 * 2] = field32[var1][var4 * 2 - 1] * var5 + field32[var1][var4 * 2 - 2] * var6; + float[] var4; + int var5; + for (var5 = 1; var5 < this.field36[var1]; ++var5) { + var3 = this.method24(var1, var5, var2); + float var6 = -2.0F * var3 * (float)Math.cos((double)this.method25(var1, var5, var2)); + float var7 = var3 * var3; + field32[var1][var5 * 2 + 1] = field32[var1][var5 * 2 - 1] * var7; + field32[var1][var5 * 2] = field32[var1][var5 * 2 - 1] * var6 + field32[var1][var5 * 2 - 2] * var7; - for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) { - var10000 = field32[var1]; - var10000[var7] += field32[var1][var7 - 1] * var5 + field32[var1][var7 - 2] * var6; + for (int var8 = var5 * 2 - 1; var8 >= 2; --var8) { + var4 = field32[var1]; + var4[var8] += field32[var1][var8 - 1] * var6 + field32[var1][var8 - 2] * var7; } - var10000 = field32[var1]; - var10000[1] += field32[var1][0] * var5 + var6; - var10000 = field32[var1]; - var10000[0] += var5; + var4 = field32[var1]; + var4[1] += field32[var1][0] * var6 + var7; + var4 = field32[var1]; + var4[0] += var6; } if (var1 == 0) { - for (var4 = 0; var4 < this.field36[0] * 2; ++var4) { - var10000 = field32[0]; - var10000[var4] *= field34; + for (var5 = 0; var5 < this.field36[0] * 2; ++var5) { + var4 = field32[0]; + var4[var5] *= field34; } } - for (var4 = 0; var4 < this.field36[var1] * 2; ++var4) { - field33[var1][var4] = (int)(field32[var1][var4] * 65536.0F); + for (var5 = 0; var5 < this.field36[var1] * 2; ++var5) { + field33[var1][var5] = (int)(field32[var1][var5] * 65536.0F); } return this.field36[var1] * 2; diff --git a/runescape-client/src/main/java/BoundaryObject.java b/runescape-client/src/main/java/BoundaryObject.java index f648c7a322..217a8415c8 100644 --- a/runescape-client/src/main/java/BoundaryObject.java +++ b/runescape-client/src/main/java/BoundaryObject.java @@ -83,9 +83,9 @@ public final class BoundaryObject { ReflectionCheck.clientPreferences.roofsHidden = !ReflectionCheck.clientPreferences.roofsHidden; WorldMapSection0.savePreferences(); if (ReflectionCheck.clientPreferences.roofsHidden) { - WorldMapIcon1.method219(99, "", "Roofs are now all hidden"); + WorldMapIcon1.addGameMessage(99, "", "Roofs are now all hidden"); } else { - WorldMapIcon1.method219(99, "", "Roofs will only be removed selectively"); + WorldMapIcon1.addGameMessage(99, "", "Roofs will only be removed selectively"); } } @@ -101,7 +101,7 @@ public final class BoundaryObject { Client.showMouseOverText = !Client.showMouseOverText; } - if (Client.rights >= 2) { + if (Client.staffModLevel >= 2) { if (var0.equalsIgnoreCase("errortest")) { throw new RuntimeException(); } diff --git a/runescape-client/src/main/java/Bounds.java b/runescape-client/src/main/java/Bounds.java index 28eb923bce..46652aebef 100644 --- a/runescape-client/src/main/java/Bounds.java +++ b/runescape-client/src/main/java/Bounds.java @@ -130,8 +130,7 @@ public class Bounds { return this.field42 + this.field44; } - @ObfuscatedName("toString") - public String method35() { + public String toString() { return null; } diff --git a/runescape-client/src/main/java/Buddy.java b/runescape-client/src/main/java/Buddy.java index a676800453..a45ba272a1 100644 --- a/runescape-client/src/main/java/Buddy.java +++ b/runescape-client/src/main/java/Buddy.java @@ -11,8 +11,8 @@ public class Buddy extends User { @ObfuscatedGetter( intValue = 429472919 ) - @Export("world0") - public int world0; + @Export("world") + public int world; @ObfuscatedName("u") @ObfuscatedGetter( intValue = 120689297 @@ -27,7 +27,7 @@ public class Buddy extends User { public int rank; Buddy() { - this.world0 = -1; + this.world = -1; } @ObfuscatedName("an") @@ -37,7 +37,7 @@ public class Buddy extends User { ) @Export("set") void set(int var1, int var2) { - this.world0 = var1; + this.world = var1; this.int2 = var2; } @@ -46,9 +46,9 @@ public class Buddy extends User { signature = "(B)I", garbageValue = "0" ) - @Export("world") - public int world() { - return this.world0; + @Export("getWorld") + public int getWorld() { + return this.world; } @ObfuscatedName("au") @@ -58,7 +58,7 @@ public class Buddy extends User { ) @Export("hasWorld") public boolean hasWorld() { - return this.world0 > 0; + return this.world > 0; } @ObfuscatedName("ff") diff --git a/runescape-client/src/main/java/class157.java b/runescape-client/src/main/java/BuddyRankComparator.java similarity index 58% rename from runescape-client/src/main/java/class157.java rename to runescape-client/src/main/java/BuddyRankComparator.java index a7d3eb0d9f..23c76bfbd4 100644 --- a/runescape-client/src/main/java/class157.java +++ b/runescape-client/src/main/java/BuddyRankComparator.java @@ -1,19 +1,23 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("fw") -public class class157 extends AbstractUserComparator { +@Implements("BuddyRankComparator") +public class BuddyRankComparator extends AbstractUserComparator { @ObfuscatedName("nm") @ObfuscatedGetter( intValue = 1006519291 ) static int field1114; @ObfuscatedName("m") - final boolean field1969; + @Export("reversed") + final boolean reversed; - public class157(boolean var1) { - this.field1969 = var1; + public BuddyRankComparator(boolean var1) { + this.reversed = var1; } @ObfuscatedName("m") @@ -21,12 +25,13 @@ public class class157 extends AbstractUserComparator { signature = "(Lke;Lke;I)I", garbageValue = "884616259" ) - int method3381(Buddy var1, Buddy var2) { - return var2.rank != var1.rank ? (this.field1969 ? var1.rank - var2.rank : var2.rank - var1.rank) : this.method12(var1, var2); + @Export("compareBuddy") + int compareBuddy(Buddy var1, Buddy var2) { + return var2.rank != var1.rank ? (this.reversed ? var1.rank - var2.rank : var2.rank - var1.rank) : this.compareUser(var1, var2); } public int compare(Object var1, Object var2) { - return this.method3381((Buddy)var1, (Buddy)var2); + return this.compareBuddy((Buddy)var1, (Buddy)var2); } @ObfuscatedName("s") diff --git a/runescape-client/src/main/java/Buffer.java b/runescape-client/src/main/java/Buffer.java index 57e9334b33..950ee61a8c 100644 --- a/runescape-client/src/main/java/Buffer.java +++ b/runescape-client/src/main/java/Buffer.java @@ -51,8 +51,8 @@ public class Buffer extends Node { garbageValue = "-654332799" ) @Export("writeByte") - public void writeByte(int var1) { - this.array[++this.index - 1] = (byte)var1; + public void writeByte(int value) { + this.array[++this.index - 1] = (byte)value; } @ObfuscatedName("w") @@ -61,9 +61,9 @@ public class Buffer extends Node { garbageValue = "0" ) @Export("writeShort") - public void writeShort(int var1) { - this.array[++this.index - 1] = (byte)(var1 >> 8); - this.array[++this.index - 1] = (byte)var1; + public void writeShort(int value) { + this.array[++this.index - 1] = (byte)(value >> 8); + this.array[++this.index - 1] = (byte)value; } @ObfuscatedName("o") @@ -72,10 +72,10 @@ public class Buffer extends Node { garbageValue = "-26" ) @Export("writeMedium") - public void writeMedium(int var1) { - this.array[++this.index - 1] = (byte)(var1 >> 16); - this.array[++this.index - 1] = (byte)(var1 >> 8); - this.array[++this.index - 1] = (byte)var1; + public void writeMedium(int value) { + this.array[++this.index - 1] = (byte)(value >> 16); + this.array[++this.index - 1] = (byte)(value >> 8); + this.array[++this.index - 1] = (byte)value; } @ObfuscatedName("u") @@ -84,11 +84,11 @@ public class Buffer extends Node { garbageValue = "-106996411" ) @Export("writeInt") - public void writeInt(int var1) { - this.array[++this.index - 1] = (byte)(var1 >> 24); - this.array[++this.index - 1] = (byte)(var1 >> 16); - this.array[++this.index - 1] = (byte)(var1 >> 8); - this.array[++this.index - 1] = (byte)var1; + public void writeInt(int value) { + this.array[++this.index - 1] = (byte)(value >> 24); + this.array[++this.index - 1] = (byte)(value >> 16); + this.array[++this.index - 1] = (byte)(value >> 8); + this.array[++this.index - 1] = (byte)value; } @ObfuscatedName("g") @@ -121,8 +121,8 @@ public class Buffer extends Node { garbageValue = "-125" ) @Export("writeBoolean") - public void writeBoolean(boolean var1) { - this.writeByte(var1 ? 1 : 0); + public void writeBoolean(boolean value) { + this.writeByte(value ? 1 : 0); } @ObfuscatedName("d") @@ -131,12 +131,12 @@ public class Buffer extends Node { garbageValue = "-9" ) @Export("writeStringCp1252NullTerminated") - public void writeStringCp1252NullTerminated(String var1) { - int var2 = var1.indexOf(0); + public void writeStringCp1252NullTerminated(String string) { + int var2 = string.indexOf(0); if (var2 >= 0) { throw new IllegalArgumentException(""); } else { - this.index += SoundCache.encodeStringCp1252(var1, 0, var1.length(), this.array, this.index); + this.index += SoundCache.encodeStringCp1252(string, 0, string.length(), this.array, this.index); this.array[++this.index - 1] = 0; } } @@ -147,13 +147,13 @@ public class Buffer extends Node { garbageValue = "22356" ) @Export("writeStringCp1252NullCircumfixed") - public void writeStringCp1252NullCircumfixed(String var1) { - int var2 = var1.indexOf(0); + public void writeStringCp1252NullCircumfixed(String string) { + int var2 = string.indexOf(0); if (var2 >= 0) { throw new IllegalArgumentException(""); } else { this.array[++this.index - 1] = 0; - this.index += SoundCache.encodeStringCp1252(var1, 0, var1.length(), this.array, this.index); + this.index += SoundCache.encodeStringCp1252(string, 0, string.length(), this.array, this.index); this.array[++this.index - 1] = 0; } } @@ -232,15 +232,15 @@ public class Buffer extends Node { garbageValue = "1324532803" ) @Export("writeSmartByteShort") - public void writeSmartByteShort(int var1) { - if (var1 >= 0 && var1 < 128) { - this.writeByte(var1); + public void writeSmartByteShort(int value) { + if (value >= 0 && value < 128) { + this.writeByte(value); } else { - if (var1 < 0 || var1 >= 32768) { + if (value < 0 || value >= 32768) { throw new IllegalArgumentException(); } - this.writeShort(var1 + 32768); + this.writeShort(value + 32768); } } @@ -388,7 +388,7 @@ public class Buffer extends Node { } int var2 = this.index - var1 - 1; - return var2 == 0 ? "" : WidgetGroupParent.decodeStringCp1252(this.array, var1, var2); + return var2 == 0 ? "" : InterfaceParent.decodeStringCp1252(this.array, var1, var2); } @ObfuscatedName("ak") @@ -408,7 +408,7 @@ public class Buffer extends Node { } int var3 = this.index - var2 - 1; - return var3 == 0 ? "" : WidgetGroupParent.decodeStringCp1252(this.array, var2, var3); + return var3 == 0 ? "" : InterfaceParent.decodeStringCp1252(this.array, var2, var3); } } @@ -578,7 +578,7 @@ public class Buffer extends Node { garbageValue = "36" ) @Export("xteaEncryptAll") - public void xteaEncryptAll(int[] var1) { + public void xteaEncryptAll(int[] xteaKey) { int var2 = this.index / 8; this.index = 0; @@ -588,8 +588,8 @@ public class Buffer extends Node { int var6 = 0; int var7 = -1640531527; - for (int var8 = 32; var8-- > 0; var5 += var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6) { - var4 += var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]; + for (int var8 = 32; var8-- > 0; var5 += var4 + (var4 << 4 ^ var4 >>> 5) ^ xteaKey[var6 >>> 11 & 3] + var6) { + var4 += var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + xteaKey[var6 & 3]; var6 += var7; } @@ -606,7 +606,7 @@ public class Buffer extends Node { garbageValue = "1682045100" ) @Export("xteaDecryptAll") - public void xteaDecryptAll(int[] var1) { + public void xteaDecryptAll(int[] xteaKey) { int var2 = this.index / 8; this.index = 0; @@ -616,8 +616,8 @@ public class Buffer extends Node { int var6 = -957401312; int var7 = -1640531527; - for (int var8 = 32; var8-- > 0; var4 -= var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]) { - var5 -= var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6; + for (int var8 = 32; var8-- > 0; var4 -= var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + xteaKey[var6 & 3]) { + var5 -= var4 + (var4 << 4 ^ var4 >>> 5) ^ xteaKey[var6 >>> 11 & 3] + var6; var6 -= var7; } @@ -634,10 +634,10 @@ public class Buffer extends Node { garbageValue = "-1341435074" ) @Export("xteaEncrypt") - public void xteaEncrypt(int[] var1, int var2, int var3) { + public void xteaEncrypt(int[] xteaKey, int start, int end) { int var4 = this.index; - this.index = var2; - int var5 = (var3 - var2) / 8; + this.index = start; + int var5 = (end - start) / 8; for (int var6 = 0; var6 < var5; ++var6) { int var7 = this.readInt(); @@ -645,8 +645,8 @@ public class Buffer extends Node { int var9 = 0; int var10 = -1640531527; - for (int var11 = 32; var11-- > 0; var8 += var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9) { - var7 += var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]; + for (int var11 = 32; var11-- > 0; var8 += var7 + (var7 << 4 ^ var7 >>> 5) ^ xteaKey[var9 >>> 11 & 3] + var9) { + var7 += var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + xteaKey[var9 & 3]; var9 += var10; } @@ -664,10 +664,10 @@ public class Buffer extends Node { garbageValue = "307218624" ) @Export("xteaDecrypt") - public void xteaDecrypt(int[] var1, int var2, int var3) { + public void xteaDecrypt(int[] xteaKey, int start, int end) { int var4 = this.index; - this.index = var2; - int var5 = (var3 - var2) / 8; + this.index = start; + int var5 = (end - start) / 8; for (int var6 = 0; var6 < var5; ++var6) { int var7 = this.readInt(); @@ -675,8 +675,8 @@ public class Buffer extends Node { int var9 = -957401312; int var10 = -1640531527; - for (int var11 = 32; var11-- > 0; var7 -= var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]) { - var8 -= var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9; + for (int var11 = 32; var11-- > 0; var7 -= var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + xteaKey[var9 & 3]) { + var8 -= var7 + (var7 << 4 ^ var7 >>> 5) ^ xteaKey[var9 >>> 11 & 3] + var9; var9 -= var10; } @@ -835,9 +835,9 @@ public class Buffer extends Node { garbageValue = "51" ) @Export("writeShortLE") - public void writeShortLE(int var1) { - this.array[++this.index - 1] = (byte)var1; - this.array[++this.index - 1] = (byte)(var1 >> 8); + public void writeShortLE(int value) { + this.array[++this.index - 1] = (byte)value; + this.array[++this.index - 1] = (byte)(value >> 8); } @ObfuscatedName("bo") @@ -936,11 +936,11 @@ public class Buffer extends Node { garbageValue = "78" ) @Export("writeIntLE") - public void writeIntLE(int var1) { - this.array[++this.index - 1] = (byte)var1; - this.array[++this.index - 1] = (byte)(var1 >> 8); - this.array[++this.index - 1] = (byte)(var1 >> 16); - this.array[++this.index - 1] = (byte)(var1 >> 24); + public void writeIntLE(int value) { + this.array[++this.index - 1] = (byte)value; + this.array[++this.index - 1] = (byte)(value >> 8); + this.array[++this.index - 1] = (byte)(value >> 16); + this.array[++this.index - 1] = (byte)(value >> 24); } @ObfuscatedName("bz") @@ -949,11 +949,11 @@ public class Buffer extends Node { garbageValue = "80" ) @Export("writeIntME") - public void writeIntME(int var1) { - this.array[++this.index - 1] = (byte)(var1 >> 8); - this.array[++this.index - 1] = (byte)var1; - this.array[++this.index - 1] = (byte)(var1 >> 24); - this.array[++this.index - 1] = (byte)(var1 >> 16); + public void writeIntME(int value) { + this.array[++this.index - 1] = (byte)(value >> 8); + this.array[++this.index - 1] = (byte)value; + this.array[++this.index - 1] = (byte)(value >> 24); + this.array[++this.index - 1] = (byte)(value >> 16); } @ObfuscatedName("bg") @@ -962,11 +962,11 @@ public class Buffer extends Node { garbageValue = "2115295559" ) @Export("writeIntLE16") - public void writeIntLE16(int var1) { - this.array[++this.index - 1] = (byte)(var1 >> 16); - this.array[++this.index - 1] = (byte)(var1 >> 24); - this.array[++this.index - 1] = (byte)var1; - this.array[++this.index - 1] = (byte)(var1 >> 8); + public void writeIntLE16(int value) { + this.array[++this.index - 1] = (byte)(value >> 16); + this.array[++this.index - 1] = (byte)(value >> 24); + this.array[++this.index - 1] = (byte)value; + this.array[++this.index - 1] = (byte)(value >> 8); } @ObfuscatedName("bt") diff --git a/runescape-client/src/main/java/BufferedFile.java b/runescape-client/src/main/java/BufferedFile.java index e7385c68e3..14cb038e54 100644 --- a/runescape-client/src/main/java/BufferedFile.java +++ b/runescape-client/src/main/java/BufferedFile.java @@ -91,11 +91,11 @@ public class BufferedFile { @ObfuscatedName("f") @Export("seek") - public void seek(long var1) throws IOException { - if (var1 < 0L) { + public void seek(long index) throws IOException { + if (index < 0L) { throw new IOException(""); } else { - this.field51 = var1; + this.field51 = index; } } @@ -115,8 +115,8 @@ public class BufferedFile { garbageValue = "617965847" ) @Export("readFill") - public void readFill(byte[] var1) throws IOException { - this.read(var1, 0, var1.length); + public void readFill(byte[] dst) throws IOException { + this.read(dst, 0, dst.length); } @ObfuscatedName("o") @@ -125,69 +125,69 @@ public class BufferedFile { garbageValue = "-35" ) @Export("read") - public void read(byte[] var1, int var2, int var3) throws IOException { + public void read(byte[] dst, int dstIndex, int length) throws IOException { try { - if (var3 + var2 > var1.length) { - throw new ArrayIndexOutOfBoundsException(var3 + var2 - var1.length); + if (length + dstIndex > dst.length) { + throw new ArrayIndexOutOfBoundsException(length + dstIndex - dst.length); } - if (-1L != this.field49 && this.field51 >= this.field49 && this.field51 + (long)var3 <= this.field49 + (long)this.field50) { - System.arraycopy(this.writeBuffer, (int)(this.field51 - this.field49), var1, var2, var3); - this.field51 += (long)var3; + if (-1L != this.field49 && this.field51 >= this.field49 && this.field51 + (long)length <= this.field49 + (long)this.field50) { + System.arraycopy(this.writeBuffer, (int)(this.field51 - this.field49), dst, dstIndex, length); + this.field51 += (long)length; return; } long var4 = this.field51; - int var6 = var3; + int var6 = length; int var7; if (this.field51 >= this.field47 && this.field51 < this.field47 + (long)this.field48) { var7 = (int)((long)this.field48 - (this.field51 - this.field47)); - if (var7 > var3) { - var7 = var3; + if (var7 > length) { + var7 = length; } - System.arraycopy(this.readBuffer, (int)(this.field51 - this.field47), var1, var2, var7); + System.arraycopy(this.readBuffer, (int)(this.field51 - this.field47), dst, dstIndex, var7); this.field51 += (long)var7; - var2 += var7; - var3 -= var7; + dstIndex += var7; + length -= var7; } - if (var3 > this.readBuffer.length) { + if (length > this.readBuffer.length) { this.accessFile.seek(this.field51); - for (this.field53 = this.field51; var3 > 0; var3 -= var7) { - var7 = this.accessFile.read(var1, var2, var3); + for (this.field53 = this.field51; length > 0; length -= var7) { + var7 = this.accessFile.read(dst, dstIndex, length); if (var7 == -1) { break; } this.field53 += (long)var7; this.field51 += (long)var7; - var2 += var7; + dstIndex += var7; } - } else if (var3 > 0) { + } else if (length > 0) { this.load(); - var7 = var3; - if (var3 > this.field48) { + var7 = length; + if (length > this.field48) { var7 = this.field48; } - System.arraycopy(this.readBuffer, 0, var1, var2, var7); - var2 += var7; - var3 -= var7; + System.arraycopy(this.readBuffer, 0, dst, dstIndex, var7); + dstIndex += var7; + length -= var7; this.field51 += (long)var7; } if (-1L != this.field49) { - if (this.field49 > this.field51 && var3 > 0) { - var7 = var2 + (int)(this.field49 - this.field51); - if (var7 > var3 + var2) { - var7 = var3 + var2; + if (this.field49 > this.field51 && length > 0) { + var7 = dstIndex + (int)(this.field49 - this.field51); + if (var7 > length + dstIndex) { + var7 = length + dstIndex; } - while (var2 < var7) { - var1[var2++] = 0; - --var3; + while (dstIndex < var7) { + dst[dstIndex++] = 0; + --length; ++this.field51; } } @@ -208,9 +208,9 @@ public class BufferedFile { if (var8 > -1L && var10 > var8) { int var12 = (int)(var10 - var8); - System.arraycopy(this.writeBuffer, (int)(var8 - this.field49), var1, (int)(var8 - var4) + var2, var12); + System.arraycopy(this.writeBuffer, (int)(var8 - this.field49), dst, (int)(var8 - var4) + dstIndex, var12); if (var10 > this.field51) { - var3 = (int)((long)var3 - (var10 - this.field51)); + length = (int)((long)length - (var10 - this.field51)); this.field51 = var10; } } @@ -220,7 +220,7 @@ public class BufferedFile { throw var13; } - if (var3 > 0) { + if (length > 0) { throw new EOFException(); } } @@ -256,34 +256,34 @@ public class BufferedFile { garbageValue = "-601174169" ) @Export("write") - public void write(byte[] var1, int var2, int var3) throws IOException { + public void write(byte[] src, int srcIndex, int length) throws IOException { try { - if (this.field51 + (long)var3 > this.capacity) { - this.capacity = this.field51 + (long)var3; + if (this.field51 + (long)length > this.capacity) { + this.capacity = this.field51 + (long)length; } if (-1L != this.field49 && (this.field51 < this.field49 || this.field51 > this.field49 + (long)this.field50)) { this.flush(); } - if (this.field49 != -1L && (long)var3 + this.field51 > this.field49 + (long)this.writeBuffer.length) { + if (this.field49 != -1L && (long)length + this.field51 > this.field49 + (long)this.writeBuffer.length) { int var4 = (int)((long)this.writeBuffer.length - (this.field51 - this.field49)); - System.arraycopy(var1, var2, this.writeBuffer, (int)(this.field51 - this.field49), var4); + System.arraycopy(src, srcIndex, this.writeBuffer, (int)(this.field51 - this.field49), var4); this.field51 += (long)var4; - var2 += var4; - var3 -= var4; + srcIndex += var4; + length -= var4; this.field50 = this.writeBuffer.length; this.flush(); } - if (var3 <= this.writeBuffer.length) { - if (var3 > 0) { + if (length <= this.writeBuffer.length) { + if (length > 0) { if (this.field49 == -1L) { this.field49 = this.field51; } - System.arraycopy(var1, var2, this.writeBuffer, (int)(this.field51 - this.field49), var3); - this.field51 += (long)var3; + System.arraycopy(src, srcIndex, this.writeBuffer, (int)(this.field51 - this.field49), length); + this.field51 += (long)length; if (this.field51 - this.field49 > (long)this.field50) { this.field50 = (int)(this.field51 - this.field49); } @@ -294,8 +294,8 @@ public class BufferedFile { this.field53 = this.field51; } - this.accessFile.write(var1, var2, var3); - this.field53 += (long)var3; + this.accessFile.write(src, srcIndex, length); + this.field53 += (long)length; if (this.field53 > this.field52) { this.field52 = this.field53; } @@ -304,22 +304,22 @@ public class BufferedFile { long var6 = -1L; if (this.field51 >= this.field47 && this.field51 < (long)this.field48 + this.field47) { var10 = this.field51; - } else if (this.field47 >= this.field51 && this.field47 < (long)var3 + this.field51) { + } else if (this.field47 >= this.field51 && this.field47 < (long)length + this.field51) { var10 = this.field47; } - if (this.field51 + (long)var3 > this.field47 && (long)var3 + this.field51 <= (long)this.field48 + this.field47) { - var6 = this.field51 + (long)var3; - } else if ((long)this.field48 + this.field47 > this.field51 && this.field47 + (long)this.field48 <= (long)var3 + this.field51) { + if (this.field51 + (long)length > this.field47 && (long)length + this.field51 <= (long)this.field48 + this.field47) { + var6 = this.field51 + (long)length; + } else if ((long)this.field48 + this.field47 > this.field51 && this.field47 + (long)this.field48 <= (long)length + this.field51) { var6 = (long)this.field48 + this.field47; } if (var10 > -1L && var6 > var10) { int var8 = (int)(var6 - var10); - System.arraycopy(var1, (int)(var10 + (long)var2 - this.field51), this.readBuffer, (int)(var10 - this.field47), var8); + System.arraycopy(src, (int)(var10 + (long)srcIndex - this.field51), this.readBuffer, (int)(var10 - this.field47), var8); } - this.field51 += (long)var3; + this.field51 += (long)length; } } catch (IOException var9) { @@ -387,8 +387,8 @@ public class BufferedFile { garbageValue = "-792629541" ) @Export("colorStartTag") - static String colorStartTag(int var0) { - return ""; + static String colorStartTag(int color) { + return ""; } @ObfuscatedName("er") diff --git a/runescape-client/src/main/java/BufferedNetSocket.java b/runescape-client/src/main/java/BufferedNetSocket.java index 16f77583d9..009146f408 100644 --- a/runescape-client/src/main/java/BufferedNetSocket.java +++ b/runescape-client/src/main/java/BufferedNetSocket.java @@ -40,8 +40,8 @@ public class BufferedNetSocket extends AbstractSocket { garbageValue = "1765046516" ) @Export("isAvailable") - public boolean isAvailable(int var1) throws IOException { - return this.source.isAvailable(var1); + public boolean isAvailable(int length) throws IOException { + return this.source.isAvailable(length); } @ObfuscatedName("q") @@ -70,8 +70,8 @@ public class BufferedNetSocket extends AbstractSocket { garbageValue = "-1089665746" ) @Export("read") - public int read(byte[] var1, int var2, int var3) throws IOException { - return this.source.read(var1, var2, var3); + public int read(byte[] dst, int dstIndex, int length) throws IOException { + return this.source.read(dst, dstIndex, length); } @ObfuscatedName("u") @@ -80,8 +80,8 @@ public class BufferedNetSocket extends AbstractSocket { garbageValue = "-86" ) @Export("write") - public void write(byte[] var1, int var2, int var3) throws IOException { - this.sink.write(var1, var2, var3); + public void write(byte[] src, int srcIndex, int length) throws IOException { + this.sink.write(src, srcIndex, length); } @ObfuscatedName("g") diff --git a/runescape-client/src/main/java/BufferedSink.java b/runescape-client/src/main/java/BufferedSink.java index f4d5e0a768..107fecae1d 100644 --- a/runescape-client/src/main/java/BufferedSink.java +++ b/runescape-client/src/main/java/BufferedSink.java @@ -40,8 +40,8 @@ public class BufferedSink implements Runnable { @Export("exception") IOException exception; @ObfuscatedName("l") - @Export("isClosed0") - boolean isClosed0; + @Export("closed") + boolean closed; BufferedSink(OutputStream var1, int var2) { this.position = 0; @@ -61,7 +61,7 @@ public class BufferedSink implements Runnable { ) @Export("isClosed") boolean isClosed() { - if (this.isClosed0) { + if (this.closed) { try { this.outputStream.close(); if (this.exception == null) { @@ -85,8 +85,8 @@ public class BufferedSink implements Runnable { garbageValue = "0" ) @Export("write") - void write(byte[] var1, int var2, int var3) throws IOException { - if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { + void write(byte[] src, int srcIndex, int length) throws IOException { + if (length >= 0 && srcIndex >= 0 && length + srcIndex <= src.length) { synchronized(this) { if (this.exception != null) { throw new IOException(this.exception.toString()); @@ -98,18 +98,18 @@ public class BufferedSink implements Runnable { var5 = this.position - this.limit - 1; } - if (var5 < var3) { + if (var5 < length) { throw new IOException(""); } else { - if (var3 + this.limit <= this.capacity) { - System.arraycopy(var1, var2, this.buffer, this.limit, var3); + if (length + this.limit <= this.capacity) { + System.arraycopy(src, srcIndex, this.buffer, this.limit, length); } else { int var6 = this.capacity - this.limit; - System.arraycopy(var1, var2, this.buffer, this.limit, var6); - System.arraycopy(var1, var6 + var2, this.buffer, 0, var3 - var6); + System.arraycopy(src, srcIndex, this.buffer, this.limit, var6); + System.arraycopy(src, var6 + srcIndex, this.buffer, 0, length - var6); } - this.limit = (var3 + this.limit) % this.capacity; + this.limit = (length + this.limit) % this.capacity; this.notifyAll(); } } @@ -127,7 +127,7 @@ public class BufferedSink implements Runnable { @Export("close") void close() { synchronized(this) { - this.isClosed0 = true; + this.closed = true; this.notifyAll(); } @@ -138,33 +138,33 @@ public class BufferedSink implements Runnable { } - @Export("run") - @ObfuscatedName("run") public void run() { while (true) { - synchronized(this){} + synchronized(this) { + ; + } while (true) { - boolean var13 = false; + boolean var1 = false; - int var1; + int var2; try { - var13 = true; + var1 = true; if (this.exception != null) { return; } if (this.position <= this.limit) { - var1 = this.limit - this.position; + var2 = this.limit - this.position; } else { - var1 = this.capacity - this.position + this.limit; + var2 = this.capacity - this.position + this.limit; } - if (var1 <= 0) { + if (var2 <= 0) { try { this.outputStream.flush(); - } catch (IOException var17) { - this.exception = var17; + } catch (IOException var20) { + this.exception = var20; return; } @@ -179,31 +179,31 @@ public class BufferedSink implements Runnable { continue; } - var13 = false; + var1 = false; } finally { - if (var13) { - ; + if (var1) { } + } try { - if (var1 + this.position <= this.capacity) { - this.outputStream.write(this.buffer, this.position, var1); - } else { - int var2 = this.capacity - this.position; + if (var2 + this.position <= this.capacity) { this.outputStream.write(this.buffer, this.position, var2); - this.outputStream.write(this.buffer, 0, var1 - var2); + } else { + int var3 = this.capacity - this.position; + this.outputStream.write(this.buffer, this.position, var3); + this.outputStream.write(this.buffer, 0, var2 - var3); } - } catch (IOException var16) { - IOException var3 = var16; + } catch (IOException var17) { + IOException var4 = var17; synchronized(this) { - this.exception = var3; + this.exception = var4; return; } } synchronized(this) { - this.position = (var1 + this.position) % this.capacity; + this.position = (var2 + this.position) % this.capacity; } if (!this.isClosed()) { @@ -221,13 +221,13 @@ public class BufferedSink implements Runnable { garbageValue = "449588720" ) static void method3603() { - Tiles.field908 = (byte[][][])null; - Fonts.field350 = (byte[][][])null; - class32.field1157 = (byte[][][])null; - class307.field1155 = (byte[][][])null; - Tiles.field910 = (int[][][])null; - Tiles.field909 = (byte[][][])null; - Huffman.field398 = (int[][])null; + Tiles.field908 = ((byte[][][])null); + Fonts.field350 = ((byte[][][])null); + class32.field1157 = ((byte[][][])null); + class307.field1155 = ((byte[][][])null); + Tiles.field910 = ((int[][][])null); + Tiles.field909 = ((byte[][][])null); + Huffman.field398 = ((int[][])null); class13.field1112 = null; Formatting.field353 = null; class214.field1131 = null; diff --git a/runescape-client/src/main/java/BufferedSource.java b/runescape-client/src/main/java/BufferedSource.java index e4ac03e286..c4371c89af 100644 --- a/runescape-client/src/main/java/BufferedSource.java +++ b/runescape-client/src/main/java/BufferedSource.java @@ -14,7 +14,7 @@ public class BufferedSource implements Runnable { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field54; + public static AbstractArchive field54; @ObfuscatedName("m") @Export("thread") Thread thread; @@ -63,10 +63,10 @@ public class BufferedSource implements Runnable { garbageValue = "1727240458" ) @Export("isAvailable") - boolean isAvailable(int var1) throws IOException { - if (var1 == 0) { + boolean isAvailable(int length) throws IOException { + if (length == 0) { return true; - } else if (var1 > 0 && var1 < this.capacity) { + } else if (length > 0 && length < this.capacity) { synchronized(this) { int var3; if (this.position <= this.limit) { @@ -75,7 +75,7 @@ public class BufferedSource implements Runnable { var3 = this.capacity - this.position + this.limit; } - if (var3 < var1) { + if (var3 < length) { if (this.exception != null) { throw new IOException(this.exception.toString()); } else { @@ -144,8 +144,8 @@ public class BufferedSource implements Runnable { garbageValue = "-37" ) @Export("read") - int read(byte[] var1, int var2, int var3) throws IOException { - if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { + int read(byte[] dst, int dstIndex, int length) throws IOException { + if (length >= 0 && dstIndex >= 0 && length + dstIndex <= dst.length) { synchronized(this) { int var5; if (this.position <= this.limit) { @@ -154,24 +154,24 @@ public class BufferedSource implements Runnable { var5 = this.capacity - this.position + this.limit; } - if (var3 > var5) { - var3 = var5; + if (length > var5) { + length = var5; } - if (var3 == 0 && this.exception != null) { + if (length == 0 && this.exception != null) { throw new IOException(this.exception.toString()); } else { - if (var3 + this.position <= this.capacity) { - System.arraycopy(this.buffer, this.position, var1, var2, var3); + if (length + this.position <= this.capacity) { + System.arraycopy(this.buffer, this.position, dst, dstIndex, length); } else { int var6 = this.capacity - this.position; - System.arraycopy(this.buffer, this.position, var1, var2, var6); - System.arraycopy(this.buffer, 0, var1, var6 + var2, var3 - var6); + System.arraycopy(this.buffer, this.position, dst, dstIndex, var6); + System.arraycopy(this.buffer, 0, dst, var6 + dstIndex, length - var6); } - this.position = (var3 + this.position) % this.capacity; + this.position = (length + this.position) % this.capacity; this.notifyAll(); - return var3; + return length; } } } else { @@ -201,8 +201,6 @@ public class BufferedSource implements Runnable { } - @Export("run") - @ObfuscatedName("run") public void run() { while (true) { int var1; diff --git a/runescape-client/src/main/java/ByteArrayPool.java b/runescape-client/src/main/java/ByteArrayPool.java index ca26e844a9..2e8ad5df4a 100644 --- a/runescape-client/src/main/java/ByteArrayPool.java +++ b/runescape-client/src/main/java/ByteArrayPool.java @@ -40,8 +40,8 @@ public class ByteArrayPool { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache13") - static IndexCache indexCache13; + @Export("archive13") + static Archive archive13; @ObfuscatedName("f") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/Bzip2Decompressor.java b/runescape-client/src/main/java/Bzip2Decompressor.java index 70b8bdb0f8..8c452325a4 100644 --- a/runescape-client/src/main/java/Bzip2Decompressor.java +++ b/runescape-client/src/main/java/Bzip2Decompressor.java @@ -292,49 +292,49 @@ public final class Bzip2Decompressor { } int var33; - int var50; - for (var50 = 0; var50 < var28; ++var50) { - var33 = method3708(5, var0); + int var52; + for (var33 = 0; var33 < var28; ++var33) { + var52 = method3708(5, var0); for (var25 = 0; var25 < var27; ++var25) { while (true) { var24 = method3711(var0); if (var24 == 0) { - var0.field88[var50][var25] = (byte)var33; + var0.field88[var33][var25] = (byte)var52; break; } var24 = method3711(var0); if (var24 == 0) { - ++var33; + ++var52; } else { - --var33; + --var52; } } } } - for (var50 = 0; var50 < var28; ++var50) { - byte var51 = 32; - byte var34 = 0; + for (var33 = 0; var33 < var28; ++var33) { + byte var34 = 32; + byte var35 = 0; for (var25 = 0; var25 < var27; ++var25) { - if (var0.field88[var50][var25] > var34) { - var34 = var0.field88[var50][var25]; + if (var0.field88[var33][var25] > var35) { + var35 = var0.field88[var33][var25]; } - if (var0.field88[var50][var25] < var51) { - var51 = var0.field88[var50][var25]; + if (var0.field88[var33][var25] < var34) { + var34 = var0.field88[var33][var25]; } } - method3706(var0.field89[var50], var0.field90[var50], var0.field91[var50], var0.field88[var50], var51, var34, var27); - var0.field92[var50] = var51; + method3706(var0.field89[var33], var0.field90[var33], var0.field91[var33], var0.field88[var33], var34, var35, var27); + var0.field92[var33] = var34; } - var33 = var0.field80 + 1; - int var52 = -1; - byte var35 = 0; + var52 = var0.field80 + 1; + int var53 = -1; + byte var54 = 0; for (var25 = 0; var25 <= 255; ++var25) { var0.field77[var25] = 0; @@ -355,17 +355,17 @@ public final class Bzip2Decompressor { int var39 = 0; byte var40; - if (var35 == 0) { - ++var52; - var35 = 50; - var40 = var0.field86[var52]; + if (var54 == 0) { + ++var53; + var54 = 50; + var40 = var0.field86[var53]; var19 = var0.field92[var40]; var20 = var0.field89[var40]; var22 = var0.field91[var40]; var21 = var0.field90[var40]; } - int var41 = var35 - 1; + int var41 = var54 - 1; int var42 = var19; int var43; @@ -378,46 +378,46 @@ public final class Bzip2Decompressor { int var45 = var22[var43 - var21[var42]]; while (true) { - int[] var10000; - int var54; - while (var45 != var33) { - int var46; - int var47; + int[] var46; + int var48; + while (var45 != var52) { + int var49; if (var45 != 0 && var45 != 1) { - var46 = var45 - 1; - int var48; - if (var46 < 16) { - var47 = var0.field85[0]; + var48 = var45 - 1; + int var10003; + int var50; + if (var48 < 16) { + var49 = var0.field85[0]; - for (var24 = var0.field84[var47 + var46]; var46 > 3; var46 -= 4) { - var48 = var47 + var46; - var0.field84[var48] = var0.field84[var48 - 1]; - var0.field84[var48 - 1] = var0.field84[var48 - 2]; - var0.field84[var48 - 2] = var0.field84[var48 - 3]; - var0.field84[var48 - 3] = var0.field84[var48 - 4]; + for (var24 = var0.field84[var49 + var48]; var48 > 3; var48 -= 4) { + var50 = var49 + var48; + var0.field84[var50] = var0.field84[var50 - 1]; + var0.field84[var50 - 1] = var0.field84[var50 - 2]; + var0.field84[var50 - 2] = var0.field84[var50 - 3]; + var0.field84[var50 - 3] = var0.field84[var50 - 4]; } - while (var46 > 0) { - var0.field84[var47 + var46] = var0.field84[var47 + var46 - 1]; - --var46; + while (var48 > 0) { + var0.field84[var49 + var48] = var0.field84[var49 + var48 - 1]; + --var48; } - var0.field84[var47] = var24; + var0.field84[var49] = var24; } else { - var48 = var46 / 16; - int var49 = var46 % 16; - var47 = var0.field85[var48] + var49; + var50 = var48 / 16; + int var51 = var48 % 16; + var49 = var0.field85[var50] + var51; - for (var24 = var0.field84[var47]; var47 > var0.field85[var48]; --var47) { - var0.field84[var47] = var0.field84[var47 - 1]; + for (var24 = var0.field84[var49]; var49 > var0.field85[var50]; --var49) { + var0.field84[var49] = var0.field84[var49 - 1]; } - for (var54 = var0.field85[var48]++; var48 > 0; --var48) { - var54 = var0.field85[var48]--; - var0.field84[var0.field85[var48]] = var0.field84[var0.field85[var48 - 1] + 16 - 1]; + for (var10003 = var0.field85[var50]++; var50 > 0; --var50) { + var10003 = var0.field85[var50]--; + var0.field84[var0.field85[var50]] = var0.field84[var0.field85[var50 - 1] + 16 - 1]; } - var54 = var0.field85[0]--; + var10003 = var0.field85[0]--; var0.field84[var0.field85[0]] = var24; if (var0.field85[0] == 0) { var36 = 4095; @@ -433,13 +433,13 @@ public final class Bzip2Decompressor { } } - var54 = var0.field77[var0.field83[var24 & 255] & 255]++; + var10003 = var0.field77[var0.field83[var24 & 255] & 255]++; WorldMapSection0.field1056[var39] = var0.field83[var24 & 255] & 255; ++var39; if (var41 == 0) { - ++var52; + ++var53; var41 = 50; - var40 = var0.field86[var52]; + var40 = var0.field86[var53]; var19 = var0.field92[var40]; var20 = var0.field89[var40]; var22 = var0.field91[var40]; @@ -456,21 +456,21 @@ public final class Bzip2Decompressor { var45 = var22[var43 - var21[var42]]; } else { - var46 = -1; - var47 = 1; + var48 = -1; + var49 = 1; do { if (var45 == 0) { - var46 += var47; + var48 += var49; } else if (var45 == 1) { - var46 += var47 * 2; + var48 += var49 * 2; } - var47 *= 2; + var49 *= 2; if (var41 == 0) { - ++var52; + ++var53; var41 = 50; - var40 = var0.field86[var52]; + var40 = var0.field86[var53]; var19 = var0.field92[var40]; var20 = var0.field89[var40]; var22 = var0.field91[var40]; @@ -488,11 +488,11 @@ public final class Bzip2Decompressor { var45 = var22[var43 - var21[var42]]; } while(var45 == 0 || var45 == 1); - ++var46; + ++var48; var24 = var0.field83[var0.field84[var0.field85[0]] & 255]; - var10000 = var0.field77; + var46 = var0.field77; - for (var10000[var24 & 255] += var46; var46 > 0; --var46) { + for (var46[var24 & 255] += var48; var48 > 0; --var48) { WorldMapSection0.field1056[var39] = var24 & 255; ++var39; } @@ -508,16 +508,16 @@ public final class Bzip2Decompressor { } for (var25 = 1; var25 <= 256; ++var25) { - var10000 = var0.field79; - var10000[var25] += var0.field79[var25 - 1]; + var46 = var0.field79; + var46[var25] += var0.field79[var25 - 1]; } for (var25 = 0; var25 < var39; ++var25) { var24 = (byte)(WorldMapSection0.field1056[var25] & 255); - var10000 = WorldMapSection0.field1056; - int var53 = var0.field79[var24 & 255]; - var10000[var53] |= var25 << 8; - var54 = var0.field79[var24 & 255]++; + var46 = WorldMapSection0.field1056; + var48 = var0.field79[var24 & 255]; + var46[var48] |= var25 << 8; + ++var0.field79[var24 & 255]; } var0.field75 = WorldMapSection0.field1056[var0.field74] >> 8; diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java index 9f34fbbd37..fa8f279fc6 100644 --- a/runescape-client/src/main/java/Canvas.java +++ b/runescape-client/src/main/java/Canvas.java @@ -10,6 +10,7 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("ao") @Implements("Canvas") @@ -117,8 +118,8 @@ public final class Canvas extends java.awt.Canvas { static int method861(int var0, Script var1, boolean var2) { int var3; int var4; - Widget var6; - if (var0 == 100) { + Widget var5; + if (var0 == ScriptOpcodes.CC_CREATE) { RouteStrategy.Interpreter_intStackSize -= 3; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; @@ -126,62 +127,62 @@ public final class Canvas extends java.awt.Canvas { if (var4 == 0) { throw new RuntimeException(); } else { - var6 = Huffman.getWidget(var3); - if (var6.children == null) { - var6.children = new Widget[var9 + 1]; + var5 = Huffman.getWidget(var3); + if (var5.children == null) { + var5.children = new Widget[var9 + 1]; } - if (var6.children.length <= var9) { + if (var5.children.length <= var9) { Widget[] var7 = new Widget[var9 + 1]; - for (int var8 = 0; var8 < var6.children.length; ++var8) { - var7[var8] = var6.children[var8]; + for (int var8 = 0; var8 < var5.children.length; ++var8) { + var7[var8] = var5.children[var8]; } - var6.children = var7; + var5.children = var7; } - if (var9 > 0 && var6.children[var9 - 1] == null) { + if (var9 > 0 && var5.children[var9 - 1] == null) { throw new RuntimeException("" + (var9 - 1)); } else { Widget var10 = new Widget(); var10.type = var4; - var10.parentId = var10.id = var6.id; + var10.parentId = var10.id = var5.id; var10.childIndex = var9; var10.isIf3 = true; - var6.children[var9] = var10; + var5.children[var9] = var10; if (var2) { WorldMapIcon1.field1030 = var10; } else { - class12.field1111 = var10; + GrandExchangeOfferAgeComparator.field1111 = var10; } - class22.method295(var6); + class22.method295(var5); return 1; } } } else { - Widget var5; - if (var0 == 101) { - var5 = var2 ? WorldMapIcon1.field1030 : class12.field1111; - var6 = Huffman.getWidget(var5.id); - var6.children[var5.childIndex] = null; - class22.method295(var6); - return 1; - } else if (var0 == 102) { - var5 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); - var5.children = null; + Widget var6; + if (var0 == ScriptOpcodes.CC_DELETE) { + var6 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111; + var5 = Huffman.getWidget(var6.id); + var5.children[var6.childIndex] = null; class22.method295(var5); return 1; - } else if (var0 != 200) { - if (var0 == 201) { - var5 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); - if (var5 != null) { + } else if (var0 == ScriptOpcodes.CC_DELETEALL) { + var6 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); + var6.children = null; + class22.method295(var6); + return 1; + } else if (var0 != ScriptOpcodes.CC_FIND) { + if (var0 == ScriptOpcodes.IF_FIND) { + var6 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); + if (var6 != null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1; if (var2) { - WorldMapIcon1.field1030 = var5; + WorldMapIcon1.field1030 = var6; } else { - class12.field1111 = var5; + GrandExchangeOfferAgeComparator.field1111 = var6; } } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; @@ -195,13 +196,13 @@ public final class Canvas extends java.awt.Canvas { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; - var6 = class204.getWidgetChild(var3, var4); - if (var6 != null && var4 != -1) { + var5 = class204.getWidgetChild(var3, var4); + if (var5 != null && var4 != -1) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1; if (var2) { - WorldMapIcon1.field1030 = var6; + WorldMapIcon1.field1030 = var5; } else { - class12.field1111 = var6; + GrandExchangeOfferAgeComparator.field1111 = var5; } } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; @@ -217,12 +218,12 @@ public final class Canvas extends java.awt.Canvas { signature = "(ILir;Ljava/lang/String;Ljava/lang/String;IZS)V", garbageValue = "-9124" ) - public static void method858(int var0, AbstractIndexCache var1, String var2, String var3, int var4, boolean var5) { - int var6 = var1.getArchiveId(var2); - int var7 = var1.getRecordId(var6, var3); + public static void method858(int var0, AbstractArchive var1, String groupName, String fileName, int var4, boolean var5) { + int var6 = var1.getGroupId(groupName); + int var7 = var1.getFileId(var6, fileName); class214.field1129 = 1; class214.field1130 = var1; - class30.musicTrackArchiveId = var6; + class30.musicTrackGroupId = var6; GrandExchangeOffer.musicTrackFileId = var7; WorldMapLabel.field1039 = var4; RectangleMode.musicTrackBoolean = var5; @@ -242,7 +243,7 @@ public final class Canvas extends java.awt.Canvas { if (var0.hitpoints == 0) { if (var0.field903 < 0 || VarbitDefinition.method4910(var0.field903, var0.field905)) { - ParamKeyDefinition.method4933(var0.level, var0.type, var0.x, var0.y, var0.field903, var0.field904, var0.field905); + ParamDefinition.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.field903, var0.field904, var0.field905); var0.remove(); } } else { @@ -251,7 +252,7 @@ public final class Canvas extends java.awt.Canvas { } if (var0.delay == 0 && var0.x >= 1 && var0.y >= 1 && var0.x <= 102 && var0.y <= 102 && (var0.id < 0 || VarbitDefinition.method4910(var0.id, var0.field908))) { - ParamKeyDefinition.method4933(var0.level, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field908); + ParamDefinition.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field908); var0.delay = -1; if (var0.field903 == var0.id && var0.field903 == -1) { var0.remove(); diff --git a/runescape-client/src/main/java/ChatChannel.java b/runescape-client/src/main/java/ChatChannel.java index 1e5967e1e3..a82d79c56d 100644 --- a/runescape-client/src/main/java/ChatChannel.java +++ b/runescape-client/src/main/java/ChatChannel.java @@ -30,7 +30,7 @@ public class ChatChannel { garbageValue = "463993373" ) @Export("addMessage") - Message addMessage(int var1, String var2, String var3, String var4) { + Message addMessage(int type, String sender, String text, String prefix) { Message var5 = this.messages[99]; for (int var6 = this.count; var6 > 0; --var6) { @@ -40,11 +40,11 @@ public class ChatChannel { } if (var5 == null) { - var5 = new Message(var1, var2, var4, var3); + var5 = new Message(type, sender, prefix, text); } else { var5.remove(); var5.removeDual(); - var5.set(var1, var2, var4, var3); + var5.set(type, sender, prefix, text); } this.messages[0] = var5; @@ -61,8 +61,8 @@ public class ChatChannel { garbageValue = "-195254780" ) @Export("getMessage") - Message getMessage(int var1) { - return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; + Message getMessage(int index) { + return index >= 0 && index < this.count ? this.messages[index] : null; } @ObfuscatedName("q") @@ -80,7 +80,8 @@ public class ChatChannel { signature = "(CI)Z", garbageValue = "-1857344803" ) - public static boolean method2238(char var0) { + @Export("isCharPrintable") + public static boolean isCharPrintable(char var0) { return var0 >= ' ' && var0 <= '~' ? true : (var0 >= 160 && var0 <= 255 ? true : var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376); } @@ -317,7 +318,7 @@ public class ChatChannel { if (var0.isIf3) { if (Client.isSpellSelected) { - if (WorldComparator.method58(class1.getWidgetClickMask(var0)) && (FloorDecoration.selectedSpellFlags & 32) == 32) { + if (GrandExchangeOfferWorldComparator.method58(class1.getWidgetClickMask(var0)) && (FloorDecoration.selectedSpellFlags & 32) == 32) { Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + var0.dataText, 58, 0, var0.childIndex, var0.id); } } else { diff --git a/runescape-client/src/main/java/ClanChat.java b/runescape-client/src/main/java/ClanChat.java index f8ffae22d0..8128276a66 100644 --- a/runescape-client/src/main/java/ClanChat.java +++ b/runescape-client/src/main/java/ClanChat.java @@ -26,7 +26,8 @@ public class ClanChat extends UserList { @Export("owner") public String owner; @ObfuscatedName("k") - public byte field96; + @Export("minKick") + public byte minKick; @ObfuscatedName("n") @ObfuscatedGetter( intValue = -1534670751 @@ -95,9 +96,9 @@ public class ClanChat extends UserList { garbageValue = "455791964" ) @Export("readUpdate") - public final void readUpdate(Buffer var1) { - this.method77(var1.readStringCp1252NullTerminated()); - long var2 = var1.readLong(); + public final void readUpdate(Buffer buffer) { + this.method77(buffer.readStringCp1252NullTerminated()); + long var2 = buffer.readLong(); long var4 = var2; String var6; int var7; @@ -126,17 +127,17 @@ public class ClanChat extends UserList { } this.method76(var6); - this.field96 = var1.readByte(); - var7 = var1.readUnsignedByte(); + this.minKick = buffer.readByte(); + var7 = buffer.readUnsignedByte(); if (var7 != 255) { this.clear(); for (int var12 = 0; var12 < var7; ++var12) { - ClanMate var13 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); - int var10 = var1.readUnsignedShort(); + ClanMate var13 = (ClanMate)this.addLastNoPreviousUsername(new Username(buffer.readStringCp1252NullTerminated(), this.loginType)); + int var10 = buffer.readUnsignedShort(); var13.set(var10, ++this.field97 - 1); - var13.rank = var1.readByte(); - var1.readStringCp1252NullTerminated(); + var13.rank = buffer.readByte(); + buffer.readStringCp1252NullTerminated(); this.method79(var13); } } @@ -164,7 +165,7 @@ public class ClanChat extends UserList { } var6 = (ClanMate)this.getByCurrentUsername(var2); - if (var6 != null && var6.world() == var3) { + if (var6 != null && var6.getWorld() == var3) { this.remove(var6); } } else { @@ -217,7 +218,7 @@ public class ClanChat extends UserList { garbageValue = "-128608554" ) final void method79(ClanMate var1) { - if (var1.username().equals(this.localUser.username())) { + if (var1.getUsername().equals(this.localUser.username())) { this.rank = var1.rank; } diff --git a/runescape-client/src/main/java/ClanMate.java b/runescape-client/src/main/java/ClanMate.java index baf085d3fa..0888815189 100644 --- a/runescape-client/src/main/java/ClanMate.java +++ b/runescape-client/src/main/java/ClanMate.java @@ -55,7 +55,7 @@ public class ClanMate extends Buddy { ) @Export("fillIsFriend") void fillIsFriend() { - this.isFriend0 = WorldMapArea.friendSystem.friendsList.contains(super.username0) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isFriend0 = WorldMapArea.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } @ObfuscatedName("w") @@ -89,6 +89,6 @@ public class ClanMate extends Buddy { ) @Export("fillIsIgnored") void fillIsIgnored() { - this.isIgnored0 = WorldMapArea.friendSystem.ignoreList.contains(super.username0) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isIgnored0 = WorldMapArea.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } } diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index 1b4b6b2170..77c7b0767f 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -18,8 +18,8 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -783816509 ) - @Export("rootWidgetGroup") - static int rootWidgetGroup; + @Export("rootInterface") + static int rootInterface; @ObfuscatedName("mc") @ObfuscatedSignature( signature = "Lho;" @@ -103,8 +103,8 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedSignature( signature = "Lld;" ) - @Export("widgetGroupParents") - static NodeHashTable widgetGroupParents; + @Export("interfaceParents") + static NodeHashTable interfaceParents; @ObfuscatedName("oy") @Export("rootWidgetXs") static int[] rootWidgetXs; @@ -132,8 +132,8 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 821563709 ) - @Export("rights") - static int rights; + @Export("staffModLevel") + static int staffModLevel; @ObfuscatedName("oi") @Export("rootWidgetYs") static int[] rootWidgetYs; @@ -253,8 +253,8 @@ public final class Client extends GameShell implements Usernamed { @Export("soundEffectIds") static int[] soundEffectIds; @ObfuscatedName("sy") - @Export("indexCacheLoaders") - static ArrayList indexCacheLoaders; + @Export("archiveLoaders") + static ArrayList archiveLoaders; @ObfuscatedName("sl") @ObfuscatedGetter( intValue = -1605855913 @@ -270,8 +270,8 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -1546210597 ) - @Export("indexCacheLoaderIndex") - static int indexCacheLoaderIndex; + @Export("archiveLoaderArchive") + static int archiveLoaderArchive; @ObfuscatedName("qn") @Export("queuedSoundEffectLoops") static int[] queuedSoundEffectLoops; @@ -500,7 +500,8 @@ public final class Client extends GameShell implements Usernamed { @Export("changedSkillsCount") static int changedSkillsCount; @ObfuscatedName("mn") - static boolean field155; + @Export("playerMod") + static boolean playerMod; @ObfuscatedName("pb") @ObfuscatedGetter( intValue = 1230692157 @@ -523,7 +524,8 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedSignature( signature = "Lbj;" ) - static OwnWorldComparator field159; + @Export("geOwnWorldComparator") + static GrandExchangeOfferOwnWorldComparator geOwnWorldComparator; @ObfuscatedName("pv") static int[] field160; @ObfuscatedName("w") @@ -571,7 +573,8 @@ public final class Client extends GameShell implements Usernamed { @Export("clientType") static int clientType; @ObfuscatedName("bl") - static boolean field162; + @Export("onMobile") + static boolean onMobile; @ObfuscatedName("br") @ObfuscatedGetter( intValue = 244995961 @@ -860,14 +863,14 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 410614005 ) - @Export("cameraPitchTarget") - static int cameraPitchTarget; + @Export("camAngleX") + static int camAngleX; @ObfuscatedName("hp") @ObfuscatedGetter( intValue = -1163038981 ) - @Export("minimapOrientation") - static int minimapOrientation; + @Export("camAngleY") + static int camAngleY; @ObfuscatedName("hv") @ObfuscatedGetter( intValue = 218086227 @@ -898,8 +901,8 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 1005832199 ) - @Export("cameraFollowHeight") - static int cameraFollowHeight; + @Export("camFollowHeight") + static int camFollowHeight; @ObfuscatedName("hc") @ObfuscatedGetter( intValue = -441913785 @@ -925,7 +928,8 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 351193663 ) - static int field197; + @Export("oculusOrbSlowedSpeed") + static int oculusOrbSlowedSpeed; @ObfuscatedName("il") @ObfuscatedGetter( intValue = -1063713523 @@ -1252,7 +1256,7 @@ public final class Client extends GameShell implements Usernamed { protected final void vmethod107() { field99 = class203.currentTimeMs() + 500L; this.method84(); - if (rootWidgetGroup != -1) { + if (rootInterface != -1) { this.method87(true); } @@ -1272,12 +1276,12 @@ public final class Client extends GameShell implements Usernamed { PlayerAppearance.field726 = class226.field1132; class229.field1137 = class226.field1133; class227.field1136 = class226.field1134; - IndexCacheLoader.field406 = class226.field1135; + ArchiveLoader.field406 = class226.field1135; TriBool.urlRequester = new UrlRequester(); this.setUpKeyboard(); this.setUpMouse(); class16.mouseWheel = this.mouseWheel(); - Fonts.indexStore255 = new IndexStore(255, class168.dat2File, class168.idx255File, 500000); + Fonts.masterDisk = new ArchiveDisk(255, class168.dat2File, class168.idx255File, 500000); ReflectionCheck.clientPreferences = class306.method5780(); this.setUpClipboard(); String var1 = Ignored.field402; @@ -1290,7 +1294,7 @@ public final class Client extends GameShell implements Usernamed { displayFps = true; } - GroundItem.method2095(ReflectionCheck.clientPreferences.windowMode); + GroundItem.setWindowedMode(ReflectionCheck.clientPreferences.windowMode); WorldMapArea.friendSystem = new FriendSystem(KeyHandler.loginType); } @@ -1299,7 +1303,8 @@ public final class Client extends GameShell implements Usernamed { signature = "(I)V", garbageValue = "1445885427" ) - protected final void vmethod112() { + @Export("doCycle") + protected final void doCycle() { ++cycle; this.doCycleJs5(); class3.method41(); @@ -1328,8 +1333,8 @@ public final class Client extends GameShell implements Usernamed { class307.soundCache = null; } } - } catch (Exception var54) { - var54.printStackTrace(); + } catch (Exception var55) { + var55.printStackTrace(); class214.midiPcmStream.clear(); class214.field1129 = 0; class13.musicTrack = null; @@ -1359,11 +1364,11 @@ public final class Client extends GameShell implements Usernamed { if (gameState == 0) { class171.method3497(); - class11.method145(); + GrandExchangeOfferNameComparator.method145(); } else if (gameState == 5) { class54.method1092(this); class171.method3497(); - class11.method145(); + GrandExchangeOfferNameComparator.method145(); } else if (gameState != 10 && gameState != 11) { if (gameState == 20) { class54.method1092(this); @@ -1375,8 +1380,8 @@ public final class Client extends GameShell implements Usernamed { int var4; for (var4 = 0; var4 < class40.regionLandArchives.length; ++var4) { - if (IndexCacheLoader.regionMapArchiveIds[var4] != -1 && class40.regionLandArchives[var4] == null) { - class40.regionLandArchives[var4] = SecureRandomFuture.indexCache5.takeRecord(IndexCacheLoader.regionMapArchiveIds[var4], 0); + if (ArchiveLoader.regionMapArchiveIds[var4] != -1 && class40.regionLandArchives[var4] == null) { + class40.regionLandArchives[var4] = SecureRandomFuture.archive5.takeFile(ArchiveLoader.regionMapArchiveIds[var4], 0); if (class40.regionLandArchives[var4] == null) { var3 = false; ++field177; @@ -1384,7 +1389,7 @@ public final class Client extends GameShell implements Usernamed { } if (MouseHandler.regionLandArchiveIds[var4] != -1 && HealthBarUpdate.regionMapArchives[var4] == null) { - HealthBarUpdate.regionMapArchives[var4] = SecureRandomFuture.indexCache5.takeRecordEncrypted(MouseHandler.regionLandArchiveIds[var4], 0, class190.xteaKeys[var4]); + HealthBarUpdate.regionMapArchives[var4] = SecureRandomFuture.archive5.takeFileEncrypted(MouseHandler.regionLandArchiveIds[var4], 0, class190.xteaKeys[var4]); if (HealthBarUpdate.regionMapArchives[var4] == null) { var3 = false; ++field177; @@ -1428,11 +1433,11 @@ public final class Client extends GameShell implements Usernamed { collisionMaps[var4].clear(); } - int var55; + int var56; for (var4 = 0; var4 < 4; ++var4) { - for (var55 = 0; var55 < 104; ++var55) { + for (var56 = 0; var56 < 104; ++var56) { for (var5 = 0; var5 < 104; ++var5) { - Tiles.Tiles_renderFlags[var4][var55][var5] = 0; + Tiles.Tiles_renderFlags[var4][var56][var5] = 0; } } } @@ -1470,20 +1475,20 @@ public final class Client extends GameShell implements Usernamed { int var21; if (!isInInstance) { byte[] var22; - for (var55 = 0; var55 < var4; ++var55) { - var5 = (class308.regions[var55] >> 8) * 64 - class50.baseX; - var6 = (class308.regions[var55] & 255) * 64 - GraphicsObject.baseY; - var22 = class40.regionLandArchives[var55]; + for (var56 = 0; var56 < var4; ++var56) { + var5 = (class308.regions[var56] >> 8) * 64 - class50.baseX; + var6 = (class308.regions[var56] & 255) * 64 - GraphicsObject.baseY; + var22 = class40.regionLandArchives[var56]; if (var22 != null) { class13.playPcmPlayers(); Varcs.method2166(var22, var5, var6, GameObject.field359 * 8 - 48, WorldMapLabelSize.field1041 * 8 - 48, collisionMaps); } } - for (var55 = 0; var55 < var4; ++var55) { - var5 = (class308.regions[var55] >> 8) * 64 - class50.baseX; - var6 = (class308.regions[var55] & 255) * 64 - GraphicsObject.baseY; - var22 = class40.regionLandArchives[var55]; + for (var56 = 0; var56 < var4; ++var56) { + var5 = (class308.regions[var56] >> 8) * 64 - class50.baseX; + var6 = (class308.regions[var56] & 255) * 64 - GraphicsObject.baseY; + var22 = class40.regionLandArchives[var56]; if (var22 == null && WorldMapLabelSize.field1041 < 800) { class13.playPcmPlayers(); UserComparator6.method3390(var5, var6, 64, 64); @@ -1492,11 +1497,11 @@ public final class Client extends GameShell implements Usernamed { UserComparator10.method3352(true); - for (var55 = 0; var55 < var4; ++var55) { - byte[] var23 = HealthBarUpdate.regionMapArchives[var55]; + for (var56 = 0; var56 < var4; ++var56) { + byte[] var23 = HealthBarUpdate.regionMapArchives[var56]; if (var23 != null) { - var6 = (class308.regions[var55] >> 8) * 64 - class50.baseX; - var21 = (class308.regions[var55] & 255) * 64 - GraphicsObject.baseY; + var6 = (class308.regions[var56] >> 8) * 64 - class50.baseX; + var21 = (class308.regions[var56] & 255) * 64 - GraphicsObject.baseY; class13.playPcmPlayers(); Scene var24 = class65.scene; CollisionMap[] var25 = collisionMaps; @@ -1546,29 +1551,29 @@ public final class Client extends GameShell implements Usernamed { } } - int var56; int var57; int var58; + int var59; if (isInInstance) { - var55 = 0; + var56 = 0; label998: while (true) { - if (var55 >= 4) { - for (var55 = 0; var55 < 13; ++var55) { + if (var56 >= 4) { + for (var56 = 0; var56 < 13; ++var56) { for (var5 = 0; var5 < 13; ++var5) { - var6 = instanceChunkTemplates[0][var55][var5]; + var6 = instanceChunkTemplates[0][var56][var5]; if (var6 == -1) { - UserComparator6.method3390(var55 * 8, var5 * 8, 8, 8); + UserComparator6.method3390(var56 * 8, var5 * 8, 8, 8); } } } UserComparator10.method3352(true); - var55 = 0; + var56 = 0; while (true) { - if (var55 >= 4) { + if (var56 >= 4) { break label998; } @@ -1576,17 +1581,17 @@ public final class Client extends GameShell implements Usernamed { for (var5 = 0; var5 < 13; ++var5) { for (var6 = 0; var6 < 13; ++var6) { - var21 = instanceChunkTemplates[var55][var5][var6]; + var21 = instanceChunkTemplates[var56][var5][var6]; if (var21 != -1) { - var56 = var21 >> 24 & 3; - var57 = var21 >> 1 & 3; - var58 = var21 >> 14 & 1023; + var57 = var21 >> 24 & 3; + var58 = var21 >> 1 & 3; + var59 = var21 >> 14 & 1023; var8 = var21 >> 3 & 2047; - var9 = (var58 / 8 << 8) + var8 / 8; + var9 = (var59 / 8 << 8) + var8 / 8; for (var10 = 0; var10 < class308.regions.length; ++var10) { if (class308.regions[var10] == var9 && HealthBarUpdate.regionMapArchives[var10] != null) { - ServerPacket.method3662(HealthBarUpdate.regionMapArchives[var10], var55, var5 * 8, var6 * 8, var56, (var58 & 7) * 8, (var8 & 7) * 8, var57, class65.scene, collisionMaps); + ServerPacket.method3662(HealthBarUpdate.regionMapArchives[var10], var56, var5 * 8, var6 * 8, var57, (var59 & 7) * 8, (var8 & 7) * 8, var58, class65.scene, collisionMaps); break; } } @@ -1594,7 +1599,7 @@ public final class Client extends GameShell implements Usernamed { } } - ++var55; + ++var56; } } @@ -1602,78 +1607,78 @@ public final class Client extends GameShell implements Usernamed { for (var5 = 0; var5 < 13; ++var5) { for (var6 = 0; var6 < 13; ++var6) { - boolean var59 = false; - var56 = instanceChunkTemplates[var55][var5][var6]; - if (var56 != -1) { - var57 = var56 >> 24 & 3; - var58 = var56 >> 1 & 3; - var8 = var56 >> 14 & 1023; - var9 = var56 >> 3 & 2047; + boolean var60 = false; + var57 = instanceChunkTemplates[var56][var5][var6]; + if (var57 != -1) { + var58 = var57 >> 24 & 3; + var59 = var57 >> 1 & 3; + var8 = var57 >> 14 & 1023; + var9 = var57 >> 3 & 2047; var10 = (var8 / 8 << 8) + var9 / 8; for (var11 = 0; var11 < class308.regions.length; ++var11) { if (class308.regions[var11] == var10 && class40.regionLandArchives[var11] != null) { - class204.method4013(class40.regionLandArchives[var11], var55, var5 * 8, var6 * 8, var57, (var8 & 7) * 8, (var9 & 7) * 8, var58, collisionMaps); - var59 = true; + class204.method4013(class40.regionLandArchives[var11], var56, var5 * 8, var6 * 8, var58, (var8 & 7) * 8, (var9 & 7) * 8, var59, collisionMaps); + var60 = true; break; } } } - if (!var59) { - var57 = var55; - var58 = var5 * 8; + if (!var60) { + var58 = var56; + var59 = var5 * 8; var8 = var6 * 8; for (var9 = 0; var9 < 8; ++var9) { for (var10 = 0; var10 < 8; ++var10) { - Tiles.Tiles_heights[var57][var9 + var58][var10 + var8] = 0; + Tiles.Tiles_heights[var58][var9 + var59][var10 + var8] = 0; } } - if (var58 > 0) { + if (var59 > 0) { for (var9 = 1; var9 < 8; ++var9) { - Tiles.Tiles_heights[var57][var58][var8 + var9] = Tiles.Tiles_heights[var57][var58 - 1][var8 + var9]; + Tiles.Tiles_heights[var58][var59][var8 + var9] = Tiles.Tiles_heights[var58][var59 - 1][var8 + var9]; } } if (var8 > 0) { for (var9 = 1; var9 < 8; ++var9) { - Tiles.Tiles_heights[var57][var58 + var9][var8] = Tiles.Tiles_heights[var57][var58 + var9][var8 - 1]; + Tiles.Tiles_heights[var58][var59 + var9][var8] = Tiles.Tiles_heights[var58][var59 + var9][var8 - 1]; } } - if (var58 > 0 && Tiles.Tiles_heights[var57][var58 - 1][var8] != 0) { - Tiles.Tiles_heights[var57][var58][var8] = Tiles.Tiles_heights[var57][var58 - 1][var8]; - } else if (var8 > 0 && Tiles.Tiles_heights[var57][var58][var8 - 1] != 0) { - Tiles.Tiles_heights[var57][var58][var8] = Tiles.Tiles_heights[var57][var58][var8 - 1]; - } else if (var58 > 0 && var8 > 0 && Tiles.Tiles_heights[var57][var58 - 1][var8 - 1] != 0) { - Tiles.Tiles_heights[var57][var58][var8] = Tiles.Tiles_heights[var57][var58 - 1][var8 - 1]; + if (var59 > 0 && Tiles.Tiles_heights[var58][var59 - 1][var8] != 0) { + Tiles.Tiles_heights[var58][var59][var8] = Tiles.Tiles_heights[var58][var59 - 1][var8]; + } else if (var8 > 0 && Tiles.Tiles_heights[var58][var59][var8 - 1] != 0) { + Tiles.Tiles_heights[var58][var59][var8] = Tiles.Tiles_heights[var58][var59][var8 - 1]; + } else if (var59 > 0 && var8 > 0 && Tiles.Tiles_heights[var58][var59 - 1][var8 - 1] != 0) { + Tiles.Tiles_heights[var58][var59][var8] = Tiles.Tiles_heights[var58][var59 - 1][var8 - 1]; } } } } - ++var55; + ++var56; } } UserComparator10.method3352(true); class13.playPcmPlayers(); - Scene var60 = class65.scene; - CollisionMap[] var61 = collisionMaps; + Scene var61 = class65.scene; + CollisionMap[] var62 = collisionMaps; for (var6 = 0; var6 < 4; ++var6) { for (var21 = 0; var21 < 104; ++var21) { - for (var56 = 0; var56 < 104; ++var56) { - if ((Tiles.Tiles_renderFlags[var6][var21][var56] & 1) == 1) { - var57 = var6; - if ((Tiles.Tiles_renderFlags[1][var21][var56] & 2) == 2) { - var57 = var6 - 1; + for (var57 = 0; var57 < 104; ++var57) { + if ((Tiles.Tiles_renderFlags[var6][var21][var57] & 1) == 1) { + var58 = var6; + if ((Tiles.Tiles_renderFlags[1][var21][var57] & 2) == 2) { + var58 = var6 - 1; } - if (var57 >= 0) { - var61[var57].method92(var21, var56); + if (var58 >= 0) { + var62[var58].method92(var21, var57); } } } @@ -1698,13 +1703,13 @@ public final class Client extends GameShell implements Usernamed { Tiles.field918 = 16; } - int[] var10000; + int[] var63; for (var6 = 0; var6 < 4; ++var6) { - byte[][] var62 = Tiles.field909[var6]; + byte[][] var28 = Tiles.field909[var6]; var10 = (int)Math.sqrt(5100.0D); var11 = var10 * 768 >> 8; - int var28; + int var29; for (var12 = 1; var12 < 103; ++var12) { for (var13 = 1; var13 < 103; ++var13) { var14 = Tiles.Tiles_heights[var6][var13 + 1][var12] - Tiles.Tiles_heights[var6][var13 - 1][var12]; @@ -1714,8 +1719,8 @@ public final class Client extends GameShell implements Usernamed { var18 = 65536 / var16; var19 = (var15 << 8) / var16; var20 = (var19 * -50 + var17 * -50 + var18 * -10) / var11 + 96; - var28 = (var62[var13 - 1][var12] >> 2) + (var62[var13][var12 - 1] >> 2) + (var62[var13 + 1][var12] >> 3) + (var62[var13][var12 + 1] >> 3) + (var62[var13][var12] >> 1); - Huffman.field398[var13][var12] = var20 - var28; + var29 = (var28[var13 - 1][var12] >> 2) + (var28[var13][var12 - 1] >> 2) + (var28[var13 + 1][var12] >> 3) + (var28[var13][var12 + 1] >> 3) + (var28[var13][var12] >> 1); + Huffman.field398[var13][var12] = var20 - var29; } } @@ -1730,21 +1735,21 @@ public final class Client extends GameShell implements Usernamed { for (var12 = -5; var12 < 109; ++var12) { for (var13 = 0; var13 < 104; ++var13) { var14 = var12 + 5; - int var10002; - UnderlayDefinition var29; + int var10003; + FloorUnderlayDefinition var31; if (var14 >= 0 && var14 < 104) { var15 = Tiles.field908[var6][var14][var13] & 255; if (var15 > 0) { - var29 = StudioGame.method4550(var15 - 1); - var10000 = class13.field1112; - var10000[var13] += var29.hue; - var10000 = Formatting.field353; - var10000[var13] += var29.saturation; - var10000 = class214.field1131; - var10000[var13] += var29.lightness; - var10000 = WorldMapSectionType.field1104; - var10000[var13] += var29.hueMultiplier; - var10002 = Message.field490[var13]++; + var31 = StudioGame.method4550(var15 - 1); + var63 = class13.field1112; + var63[var13] += var31.hue; + var63 = Formatting.field353; + var63[var13] += var31.saturation; + var63 = class214.field1131; + var63[var13] += var31.lightness; + var63 = WorldMapSectionType.field1104; + var63[var13] += var31.hueMultiplier; + var10003 = Message.field490[var13]++; } } @@ -1752,16 +1757,16 @@ public final class Client extends GameShell implements Usernamed { if (var15 >= 0 && var15 < 104) { var16 = Tiles.field908[var6][var15][var13] & 255; if (var16 > 0) { - var29 = StudioGame.method4550(var16 - 1); - var10000 = class13.field1112; - var10000[var13] -= var29.hue; - var10000 = Formatting.field353; - var10000[var13] -= var29.saturation; - var10000 = class214.field1131; - var10000[var13] -= var29.lightness; - var10000 = WorldMapSectionType.field1104; - var10000[var13] -= var29.hueMultiplier; - var10002 = Message.field490[var13]--; + var31 = StudioGame.method4550(var16 - 1); + var63 = class13.field1112; + var63[var13] -= var31.hue; + var63 = Formatting.field353; + var63[var13] -= var31.saturation; + var63 = class214.field1131; + var63[var13] -= var31.lightness; + var63 = WorldMapSectionType.field1104; + var63[var13] -= var31.hueMultiplier; + var10003 = Message.field490[var13]--; } } } @@ -1797,144 +1802,144 @@ public final class Client extends GameShell implements Usernamed { Tiles.Tiles_minPlane = var6; } - var28 = Tiles.field908[var6][var12][var18] & 255; - int var65 = Fonts.field350[var6][var12][var18] & 255; - if (var28 > 0 || var65 > 0) { - int var30 = Tiles.Tiles_heights[var6][var12][var18]; - int var31 = Tiles.Tiles_heights[var6][var12 + 1][var18]; - int var32 = Tiles.Tiles_heights[var6][var12 + 1][var18 + 1]; - int var33 = Tiles.Tiles_heights[var6][var12][var18 + 1]; - int var34 = Huffman.field398[var12][var18]; - int var35 = Huffman.field398[var12 + 1][var18]; - int var36 = Huffman.field398[var12 + 1][var18 + 1]; - int var37 = Huffman.field398[var12][var18 + 1]; - int var38 = -1; + var29 = Tiles.field908[var6][var12][var18] & 255; + int var30 = Fonts.field350[var6][var12][var18] & 255; + if (var29 > 0 || var30 > 0) { + int var66 = Tiles.Tiles_heights[var6][var12][var18]; + int var32 = Tiles.Tiles_heights[var6][var12 + 1][var18]; + int var33 = Tiles.Tiles_heights[var6][var12 + 1][var18 + 1]; + int var34 = Tiles.Tiles_heights[var6][var12][var18 + 1]; + int var35 = Huffman.field398[var12][var18]; + int var36 = Huffman.field398[var12 + 1][var18]; + int var37 = Huffman.field398[var12 + 1][var18 + 1]; + int var38 = Huffman.field398[var12][var18 + 1]; int var39 = -1; - int var40; + int var40 = -1; int var41; int var42; - if (var28 > 0) { - var40 = var13 * 256 / var16; - var41 = var14 / var17; - var42 = var15 / var17; - var38 = WorldMapAreaData.method712(var40, var41, var42); - var40 = var40 + Tiles.field917 & 255; - var42 += Tiles.field918; - if (var42 < 0) { - var42 = 0; - } else if (var42 > 255) { - var42 = 255; + int var43; + if (var29 > 0) { + var41 = var13 * 256 / var16; + var42 = var14 / var17; + var43 = var15 / var17; + var39 = WorldMapAreaData.method712(var41, var42, var43); + var41 = var41 + Tiles.field917 & 255; + var43 += Tiles.field918; + if (var43 < 0) { + var43 = 0; + } else if (var43 > 255) { + var43 = 255; } - var39 = WorldMapAreaData.method712(var40, var41, var42); + var40 = WorldMapAreaData.method712(var41, var42, var43); } - OverlayDefinition var43; + FloorOverlayDefinition var44; if (var6 > 0) { - boolean var44 = true; - if (var28 == 0 && class32.field1157[var6][var12][var18] != 0) { - var44 = false; + boolean var45 = true; + if (var29 == 0 && class32.field1157[var6][var12][var18] != 0) { + var45 = false; } - if (var65 > 0) { - var42 = var65 - 1; - var43 = (OverlayDefinition)OverlayDefinition.field664.get((long)var42); - OverlayDefinition var45; - if (var43 != null) { - var45 = var43; + if (var30 > 0) { + var43 = var30 - 1; + var44 = (FloorOverlayDefinition)FloorOverlayDefinition.field664.get((long)var43); + FloorOverlayDefinition var46; + if (var44 != null) { + var46 = var44; } else { - byte[] var46 = OverlayDefinition.field663.takeRecord(4, var42); - var43 = new OverlayDefinition(); - if (var46 != null) { - var43.read(new Buffer(var46), var42); + byte[] var47 = FloorOverlayDefinition.field663.takeFile(4, var43); + var44 = new FloorOverlayDefinition(); + if (var47 != null) { + var44.decode(new Buffer(var47), var43); } - var43.init(); - OverlayDefinition.field664.put(var43, (long)var42); - var45 = var43; + var44.postDecode(); + FloorOverlayDefinition.field664.put(var44, (long)var43); + var46 = var44; } - if (!var45.field665) { - var44 = false; + if (!var46.field665) { + var45 = false; } } - if (var44 && var30 == var31 && var30 == var32 && var33 == var30) { - var10000 = Tiles.field910[var6][var12]; - var10000[var18] |= 2340; + if (var45 && var66 == var32 && var66 == var33 && var34 == var66) { + var63 = Tiles.field910[var6][var12]; + var63[var18] |= 2340; } } - var40 = 0; - if (var39 != -1) { - var40 = Rasterizer3D.Rasterizer3D_colorPalette[class15.method183(var39, 96)]; + var41 = 0; + if (var40 != -1) { + var41 = Rasterizer3D.Rasterizer3D_colorPalette[class15.method183(var40, 96)]; } - if (var65 == 0) { - var60.addTile(var6, var12, var18, 0, 0, -1, var30, var31, var32, var33, class15.method183(var38, var34), class15.method183(var38, var35), class15.method183(var38, var36), class15.method183(var38, var37), 0, 0, 0, 0, var40, 0); + if (var30 == 0) { + var61.addTile(var6, var12, var18, 0, 0, -1, var66, var32, var33, var34, class15.method183(var39, var35), class15.method183(var39, var36), class15.method183(var39, var37), class15.method183(var39, var38), 0, 0, 0, 0, var41, 0); } else { - var41 = class32.field1157[var6][var12][var18] + 1; - byte var66 = class307.field1155[var6][var12][var18]; - int var67 = var65 - 1; - OverlayDefinition var68 = (OverlayDefinition)OverlayDefinition.field664.get((long)var67); - if (var68 != null) { - var43 = var68; + var42 = class32.field1157[var6][var12][var18] + 1; + byte var67 = class307.field1155[var6][var12][var18]; + int var68 = var30 - 1; + FloorOverlayDefinition var69 = (FloorOverlayDefinition)FloorOverlayDefinition.field664.get((long)var68); + if (var69 != null) { + var44 = var69; } else { - byte[] var47 = OverlayDefinition.field663.takeRecord(4, var67); - var68 = new OverlayDefinition(); - if (var47 != null) { - var68.read(new Buffer(var47), var67); + byte[] var48 = FloorOverlayDefinition.field663.takeFile(4, var68); + var69 = new FloorOverlayDefinition(); + if (var48 != null) { + var69.decode(new Buffer(var48), var68); } - var68.init(); - OverlayDefinition.field664.put(var68, (long)var67); - var43 = var68; + var69.postDecode(); + FloorOverlayDefinition.field664.put(var69, (long)var68); + var44 = var69; } - int var69 = var43.texture; - int var48; + int var70 = var44.texture; int var49; int var50; int var51; - if (var69 >= 0) { - var49 = Rasterizer3D.Rasterizer3D_textureLoader.vmethod324(var69); - var48 = -1; - } else if (var43.rgb == 16711935) { - var48 = -2; - var69 = -1; + int var52; + if (var70 >= 0) { + var50 = Rasterizer3D.Rasterizer3D_textureLoader.vmethod324(var70); + var49 = -1; + } else if (var44.rgb == 16711935) { var49 = -2; + var70 = -1; + var50 = -2; } else { - var48 = WorldMapAreaData.method712(var43.hue, var43.saturation, var43.lightness); - var50 = var43.hue + Tiles.field917 & 255; - var51 = var43.lightness + Tiles.field918; - if (var51 < 0) { - var51 = 0; - } else if (var51 > 255) { - var51 = 255; - } - - var49 = WorldMapAreaData.method712(var50, var43.saturation, var51); - } - - var50 = 0; - if (var49 != -2) { - var50 = Rasterizer3D.Rasterizer3D_colorPalette[WorldMapDecoration.method348(var49, 96)]; - } - - if (var43.rgb2 != -1) { - var51 = var43.hue2 + Tiles.field917 & 255; - int var52 = var43.lightness2 + Tiles.field918; + var49 = WorldMapAreaData.method712(var44.hue, var44.saturation, var44.lightness); + var51 = var44.hue + Tiles.field917 & 255; + var52 = var44.lightness + Tiles.field918; if (var52 < 0) { var52 = 0; } else if (var52 > 255) { var52 = 255; } - var49 = WorldMapAreaData.method712(var51, var43.saturation2, var52); - var50 = Rasterizer3D.Rasterizer3D_colorPalette[WorldMapDecoration.method348(var49, 96)]; + var50 = WorldMapAreaData.method712(var51, var44.saturation, var52); } - var60.addTile(var6, var12, var18, var41, var66, var69, var30, var31, var32, var33, class15.method183(var38, var34), class15.method183(var38, var35), class15.method183(var38, var36), class15.method183(var38, var37), WorldMapDecoration.method348(var48, var34), WorldMapDecoration.method348(var48, var35), WorldMapDecoration.method348(var48, var36), WorldMapDecoration.method348(var48, var37), var40, var50); + var51 = 0; + if (var50 != -2) { + var51 = Rasterizer3D.Rasterizer3D_colorPalette[WorldMapDecoration.method348(var50, 96)]; + } + + if (var44.rgb2 != -1) { + var52 = var44.hue2 + Tiles.field917 & 255; + int var53 = var44.lightness2 + Tiles.field918; + if (var53 < 0) { + var53 = 0; + } else if (var53 > 255) { + var53 = 255; + } + + var50 = WorldMapAreaData.method712(var52, var44.saturation2, var53); + var51 = Rasterizer3D.Rasterizer3D_colorPalette[WorldMapDecoration.method348(var50, 96)]; + } + + var61.addTile(var6, var12, var18, var42, var67, var70, var66, var32, var33, var34, class15.method183(var39, var35), class15.method183(var39, var36), class15.method183(var39, var37), class15.method183(var39, var38), WorldMapDecoration.method348(var49, var35), WorldMapDecoration.method348(var49, var36), WorldMapDecoration.method348(var49, var37), WorldMapDecoration.method348(var49, var38), var41, var51); } } } @@ -1952,51 +1957,51 @@ public final class Client extends GameShell implements Usernamed { var18 = var6; } - var60.setTileMinPlane(var6, var13, var12, var18); + var61.setTileMinPlane(var6, var13, var12, var18); } } - Tiles.field908[var6] = (byte[][])null; - Fonts.field350[var6] = (byte[][])null; - class32.field1157[var6] = (byte[][])null; - class307.field1155[var6] = (byte[][])null; - Tiles.field909[var6] = (byte[][])null; + Tiles.field908[var6] = ((byte[][])null); + Fonts.field350[var6] = ((byte[][])null); + class32.field1157[var6] = ((byte[][])null); + class307.field1155[var6] = ((byte[][])null); + Tiles.field909[var6] = ((byte[][])null); } - var60.method293(-50, -10, -50); + var61.method293(-50, -10, -50); for (var6 = 0; var6 < 104; ++var6) { for (var21 = 0; var21 < 104; ++var21) { if ((Tiles.Tiles_renderFlags[1][var6][var21] & 2) == 2) { - var60.setLinkBelow(var6, var21); + var61.setLinkBelow(var6, var21); } } } var6 = 1; var21 = 2; - var56 = 4; + var57 = 4; - for (var57 = 0; var57 < 4; ++var57) { - if (var57 > 0) { + for (var58 = 0; var58 < 4; ++var58) { + if (var58 > 0) { var6 <<= 3; var21 <<= 3; - var56 <<= 3; + var57 <<= 3; } - for (var58 = 0; var58 <= var57; ++var58) { + for (var59 = 0; var59 <= var58; ++var59) { for (var8 = 0; var8 <= 104; ++var8) { for (var9 = 0; var9 <= 104; ++var9) { - short var63; - if ((Tiles.field910[var58][var9][var8] & var6) != 0) { + short var64; + if ((Tiles.field910[var59][var9][var8] & var6) != 0) { var10 = var8; var11 = var8; - var12 = var58; + var12 = var59; - for (var13 = var58; var10 > 0 && (Tiles.field910[var58][var9][var10 - 1] & var6) != 0; --var10) { + for (var13 = var59; var10 > 0 && (Tiles.field910[var59][var9][var10 - 1] & var6) != 0; --var10) { } - while (var11 < 104 && (Tiles.field910[var58][var9][var11 + 1] & var6) != 0) { + while (var11 < 104 && (Tiles.field910[var59][var9][var11 + 1] & var6) != 0) { ++var11; } @@ -2012,7 +2017,7 @@ public final class Client extends GameShell implements Usernamed { } label638: - while (var13 < var57) { + while (var13 < var58) { for (var14 = var10; var14 <= var11; ++var14) { if ((Tiles.field910[var13 + 1][var9][var14] & var6) == 0) { break label638; @@ -2024,29 +2029,29 @@ public final class Client extends GameShell implements Usernamed { var14 = (var11 - var10 + 1) * (var13 + 1 - var12); if (var14 >= 8) { - var63 = 240; - var16 = Tiles.Tiles_heights[var13][var9][var10] - var63; + var64 = 240; + var16 = Tiles.Tiles_heights[var13][var9][var10] - var64; var17 = Tiles.Tiles_heights[var12][var9][var10]; - Scene.Scene_addOccluder(var57, 1, var9 * 128, var9 * 128, var10 * 128, var11 * 128 + 128, var16, var17); + Scene.Scene_addOccluder(var58, 1, var9 * 128, var9 * 128, var10 * 128, var11 * 128 + 128, var16, var17); for (var18 = var12; var18 <= var13; ++var18) { for (var19 = var10; var19 <= var11; ++var19) { - var10000 = Tiles.field910[var18][var9]; - var10000[var19] &= ~var6; + var63 = Tiles.field910[var18][var9]; + var63[var19] &= ~var6; } } } } - if ((Tiles.field910[var58][var9][var8] & var21) != 0) { + if ((Tiles.field910[var59][var9][var8] & var21) != 0) { var10 = var9; var11 = var9; - var12 = var58; + var12 = var59; - for (var13 = var58; var10 > 0 && (Tiles.field910[var58][var10 - 1][var8] & var21) != 0; --var10) { + for (var13 = var59; var10 > 0 && (Tiles.field910[var59][var10 - 1][var8] & var21) != 0; --var10) { } - while (var11 < 104 && (Tiles.field910[var58][var11 + 1][var8] & var21) != 0) { + while (var11 < 104 && (Tiles.field910[var59][var11 + 1][var8] & var21) != 0) { ++var11; } @@ -2062,7 +2067,7 @@ public final class Client extends GameShell implements Usernamed { } label691: - while (var13 < var57) { + while (var13 < var58) { for (var14 = var10; var14 <= var11; ++var14) { if ((Tiles.field910[var13 + 1][var14][var8] & var21) == 0) { break label691; @@ -2074,36 +2079,36 @@ public final class Client extends GameShell implements Usernamed { var14 = (var11 - var10 + 1) * (var13 + 1 - var12); if (var14 >= 8) { - var63 = 240; - var16 = Tiles.Tiles_heights[var13][var10][var8] - var63; + var64 = 240; + var16 = Tiles.Tiles_heights[var13][var10][var8] - var64; var17 = Tiles.Tiles_heights[var12][var10][var8]; - Scene.Scene_addOccluder(var57, 2, var10 * 128, var11 * 128 + 128, var8 * 128, var8 * 128, var16, var17); + Scene.Scene_addOccluder(var58, 2, var10 * 128, var11 * 128 + 128, var8 * 128, var8 * 128, var16, var17); for (var18 = var12; var18 <= var13; ++var18) { for (var19 = var10; var19 <= var11; ++var19) { - var10000 = Tiles.field910[var18][var19]; - var10000[var8] &= ~var21; + var63 = Tiles.field910[var18][var19]; + var63[var8] &= ~var21; } } } } - if ((Tiles.field910[var58][var9][var8] & var56) != 0) { + if ((Tiles.field910[var59][var9][var8] & var57) != 0) { var10 = var9; var11 = var9; var12 = var8; - for (var13 = var8; var12 > 0 && (Tiles.field910[var58][var9][var12 - 1] & var56) != 0; --var12) { + for (var13 = var8; var12 > 0 && (Tiles.field910[var59][var9][var12 - 1] & var57) != 0; --var12) { } - while (var13 < 104 && (Tiles.field910[var58][var9][var13 + 1] & var56) != 0) { + while (var13 < 104 && (Tiles.field910[var59][var9][var13 + 1] & var57) != 0) { ++var13; } label755: while (var10 > 0) { for (var14 = var12; var14 <= var13; ++var14) { - if ((Tiles.field910[var58][var10 - 1][var14] & var56) == 0) { + if ((Tiles.field910[var59][var10 - 1][var14] & var57) == 0) { break label755; } } @@ -2114,7 +2119,7 @@ public final class Client extends GameShell implements Usernamed { label744: while (var11 < 104) { for (var14 = var12; var14 <= var13; ++var14) { - if ((Tiles.field910[var58][var11 + 1][var14] & var56) == 0) { + if ((Tiles.field910[var59][var11 + 1][var14] & var57) == 0) { break label744; } } @@ -2123,13 +2128,13 @@ public final class Client extends GameShell implements Usernamed { } if ((var13 - var12 + 1) * (var11 - var10 + 1) >= 4) { - var14 = Tiles.Tiles_heights[var58][var10][var12]; - Scene.Scene_addOccluder(var57, 4, var10 * 128, var11 * 128 + 128, var12 * 128, var13 * 128 + 128, var14, var14); + var14 = Tiles.Tiles_heights[var59][var10][var12]; + Scene.Scene_addOccluder(var58, 4, var10 * 128, var11 * 128 + 128, var12 * 128, var13 * 128 + 128, var14, var14); for (var15 = var10; var15 <= var11; ++var15) { for (var16 = var12; var16 <= var13; ++var16) { - var10000 = Tiles.field910[var58][var15]; - var10000[var16] &= ~var56; + var63 = Tiles.field910[var59][var15]; + var63[var16] &= ~var57; } } } @@ -2156,32 +2161,32 @@ public final class Client extends GameShell implements Usernamed { } for (var21 = 0; var21 < 104; ++var21) { - for (var56 = 0; var56 < 104; ++var56) { - TilePaint.updateItemPile(var21, var56); + for (var57 = 0; var57 < 104; ++var57) { + TilePaint.updateItemPile(var21, var57); } } class13.playPcmPlayers(); ScriptEvent.method1179(); ObjectDefinition.field641.clear(); - PacketBufferNode var64; + PacketBufferNode var65; if (TextureProvider.client.hasFrame()) { - var64 = Interpreter.method1915(ClientPacket.field231, packetWriter.isaacCipher); - var64.packetBuffer.writeInt(1057001181); - packetWriter.method241(var64); + var65 = Interpreter.method1915(ClientPacket.field231, packetWriter.isaacCipher); + var65.packetBuffer.writeInt(1057001181); + packetWriter.method241(var65); } if (!isInInstance) { var21 = (GameObject.field359 - 6) / 8; - var56 = (GameObject.field359 + 6) / 8; - var57 = (WorldMapLabelSize.field1041 - 6) / 8; - var58 = (WorldMapLabelSize.field1041 + 6) / 8; + var57 = (GameObject.field359 + 6) / 8; + var58 = (WorldMapLabelSize.field1041 - 6) / 8; + var59 = (WorldMapLabelSize.field1041 + 6) / 8; - for (var8 = var21 - 1; var8 <= var56 + 1; ++var8) { - for (var9 = var57 - 1; var9 <= var58 + 1; ++var9) { - if (var8 < var21 || var8 > var56 || var9 < var57 || var9 > var58) { - SecureRandomFuture.indexCache5.method10("m" + var8 + "_" + var9); - SecureRandomFuture.indexCache5.method10("l" + var8 + "_" + var9); + for (var8 = var21 - 1; var8 <= var57 + 1; ++var8) { + for (var9 = var58 - 1; var9 <= var59 + 1; ++var9) { + if (var8 < var21 || var8 > var57 || var9 < var58 || var9 > var59) { + SecureRandomFuture.archive5.method10("m" + var8 + "_" + var9); + SecureRandomFuture.archive5.method10("l" + var8 + "_" + var9); } } } @@ -2190,9 +2195,9 @@ public final class Client extends GameShell implements Usernamed { GameShell.updateGameState(30); class13.playPcmPlayers(); BufferedSink.method3603(); - var64 = Interpreter.method1915(ClientPacket.field298, packetWriter.isaacCipher); - packetWriter.method241(var64); - class11.method145(); + var65 = Interpreter.method1915(ClientPacket.field298, packetWriter.isaacCipher); + packetWriter.method241(var65); + GrandExchangeOfferNameComparator.method145(); } } } @@ -2213,14 +2218,14 @@ public final class Client extends GameShell implements Usernamed { signature = "(ZI)V", garbageValue = "106302203" ) - @Export("methodDraw") - protected final void methodDraw(boolean var1) { + @Export("draw") + protected final void draw(boolean var1) { boolean var2; label139: { try { if (class214.field1129 == 2) { if (class13.musicTrack == null) { - class13.musicTrack = MusicTrack.readTrack(class214.field1130, class30.musicTrackArchiveId, GrandExchangeOffer.musicTrackFileId); + class13.musicTrack = MusicTrack.readTrack(class214.field1130, class30.musicTrackGroupId, GrandExchangeOffer.musicTrackFileId); if (class13.musicTrack == null) { var2 = false; break label139; @@ -2260,7 +2265,7 @@ public final class Client extends GameShell implements Usernamed { } if ((gameState == 10 || gameState == 20 || gameState == 30) && field99 != 0L && class203.currentTimeMs() > field99) { - GroundItem.method2095(SpotAnimationDefinition.method4822()); + GroundItem.setWindowedMode(SpotAnimationDefinition.getWindowedMode()); } int var3; @@ -2273,10 +2278,10 @@ public final class Client extends GameShell implements Usernamed { if (gameState == 0) { this.drawInitial(Login.Login_loadingPercent, Login.Login_loadingText, var1); } else if (gameState == 5) { - IndexCacheLoader.drawTitle(class2.fontBold12, ScriptEvent.fontPlain11, DevicePcmPlayerProvider.fontPlain12); + ArchiveLoader.drawTitle(class2.fontBold12, ScriptEvent.fontPlain11, DevicePcmPlayerProvider.fontPlain12); } else if (gameState != 10 && gameState != 11) { if (gameState == 20) { - IndexCacheLoader.drawTitle(class2.fontBold12, ScriptEvent.fontPlain11, DevicePcmPlayerProvider.fontPlain12); + ArchiveLoader.drawTitle(class2.fontBold12, ScriptEvent.fontPlain11, DevicePcmPlayerProvider.fontPlain12); } else if (gameState == 25) { if (field181 == 1) { if (field177 > field178) { @@ -2303,7 +2308,7 @@ public final class Client extends GameShell implements Usernamed { PendingSpawn.drawLoadingMessage("Please wait...", false); } } else { - IndexCacheLoader.drawTitle(class2.fontBold12, ScriptEvent.fontPlain11, DevicePcmPlayerProvider.fontPlain12); + ArchiveLoader.drawTitle(class2.fontBold12, ScriptEvent.fontPlain11, DevicePcmPlayerProvider.fontPlain12); } if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { @@ -2359,8 +2364,8 @@ public final class Client extends GameShell implements Usernamed { WorldMapCacheName.pcmPlayer0.shutdown(); } - if (AbstractIndexCache.pcmPlayer1 != null) { - AbstractIndexCache.pcmPlayer1.shutdown(); + if (AbstractArchive.pcmPlayer1 != null) { + AbstractArchive.pcmPlayer1.shutdown(); } if (NetCache.NetCache_socket != null) { @@ -2377,7 +2382,7 @@ public final class Client extends GameShell implements Usernamed { class168.dat2File.close(); for (int var9 = 0; var9 < class168.idxCount; ++var9) { - IndexStoreAction.idxFiles[var9].close(); + ArchiveDiskAction.idxFiles[var9].close(); } class168.idx255File.close(); @@ -2396,27 +2401,29 @@ public final class Client extends GameShell implements Usernamed { } @ObfuscatedName("init") - public final void vmethod117() { + @Export("init") + public final void init() { try { if (this.checkHost()) { ClientParameter[] var1 = class4.method47(); - int var3 = 0; + int var2 = 0; while (true) { - int var2; - if (var3 >= var1.length) { + int var3; + int var6; + if (var2 >= var1.length) { class237.method4539(); class50.worldHost = this.getCodeBase().getHost(); - String var25 = class15.serverBuild.name; - byte var26 = 0; + String var26 = class15.serverBuild.name; + byte var27 = 0; try { class168.idxCount = 21; - PacketBuffer.field667 = var26; + PacketBuffer.field667 = var27; try { class266.osName = System.getProperty("os.name"); - } catch (Exception var20) { + } catch (Exception var21) { class266.osName = "Unknown"; } @@ -2427,7 +2434,7 @@ public final class Client extends GameShell implements Usernamed { if (WorldMapSection1.userHomeDirectory != null) { WorldMapSection1.userHomeDirectory = WorldMapSection1.userHomeDirectory + "/"; } - } catch (Exception var19) { + } catch (Exception var20) { } try { @@ -2442,7 +2449,7 @@ public final class Client extends GameShell implements Usernamed { if (WorldMapSection1.userHomeDirectory != null) { WorldMapSection1.userHomeDirectory = WorldMapSection1.userHomeDirectory + "/"; } - } catch (Exception var18) { + } catch (Exception var19) { } if (WorldMapSection1.userHomeDirectory == null) { @@ -2451,114 +2458,114 @@ public final class Client extends GameShell implements Usernamed { WorldMapSection2.cacheDirectoryLocations = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", WorldMapSection1.userHomeDirectory, "/tmp/", ""}; Canvas.field94 = new String[]{".jagex_cache_" + PacketBuffer.field667, ".file_store_" + PacketBuffer.field667}; - int var27 = 0; + var6 = 0; - label262: - while (var27 < 4) { - String var28 = var27 == 0 ? "" : "" + var27; - class337.clDat = new File(WorldMapSection1.userHomeDirectory, "jagex_cl_oldschool_" + var25 + var28 + ".dat"); + label256: + while (var6 < 4) { + String var28 = var6 == 0 ? "" : "" + var6; + class337.clDat = new File(WorldMapSection1.userHomeDirectory, "jagex_cl_oldschool_" + var26 + var28 + ".dat"); String var30 = null; String var31 = null; boolean var32 = false; - int var14; - File var33; + int var11; + File var12; if (class337.clDat.exists()) { try { - AccessFile var11 = new AccessFile(class337.clDat, "rw", 10000L); + AccessFile var13 = new AccessFile(class337.clDat, "rw", 10000L); - int var12; - Buffer var13; - for (var13 = new Buffer((int)var11.length()); var13.index < var13.array.length; var13.index += var12) { - var12 = var11.read(var13.array, var13.index, var13.array.length - var13.index); - if (var12 == -1) { + int var14; + Buffer var15; + for (var15 = new Buffer((int)var13.length()); var15.index < var15.array.length; var15.index += var14) { + var14 = var13.read(var15.array, var15.index, var15.array.length - var15.index); + if (var14 == -1) { throw new IOException(); } } - var13.index = 0; - var12 = var13.readUnsignedByte(); - if (var12 < 1 || var12 > 3) { - throw new IOException("" + var12); + var15.index = 0; + var14 = var15.readUnsignedByte(); + if (var14 < 1 || var14 > 3) { + throw new IOException("" + var14); } - var14 = 0; - if (var12 > 1) { - var14 = var13.readUnsignedByte(); + var11 = 0; + if (var14 > 1) { + var11 = var15.readUnsignedByte(); } - if (var12 <= 2) { - var30 = var13.readStringCp1252NullCircumfixed(); - if (var14 == 1) { - var31 = var13.readStringCp1252NullCircumfixed(); + if (var14 <= 2) { + var30 = var15.readStringCp1252NullCircumfixed(); + if (var11 == 1) { + var31 = var15.readStringCp1252NullCircumfixed(); } } else { - var30 = var13.method45(); - if (var14 == 1) { - var31 = var13.method45(); + var30 = var15.method45(); + if (var11 == 1) { + var31 = var15.method45(); } } - var11.close(); - } catch (IOException var22) { - var22.printStackTrace(); + var13.close(); + } catch (IOException var23) { + var23.printStackTrace(); } if (var30 != null) { - var33 = new File(var30); - if (!var33.exists()) { + var12 = new File(var30); + if (!var12.exists()) { var30 = null; } } if (var30 != null) { - var33 = new File(var30, "test.dat"); - if (!DevicePcmPlayerProvider.method847(var33, true)) { + var12 = new File(var30, "test.dat"); + if (!DevicePcmPlayerProvider.method847(var12, true)) { var30 = null; } } } - if (var30 == null && var27 == 0) { - label237: - for (var2 = 0; var2 < Canvas.field94.length; ++var2) { + File var36; + if (var30 == null && var6 == 0) { + label232: + for (var3 = 0; var3 < Canvas.field94.length; ++var3) { for (int var34 = 0; var34 < WorldMapSection2.cacheDirectoryLocations.length; ++var34) { - File var37 = new File(WorldMapSection2.cacheDirectoryLocations[var34] + Canvas.field94[var2] + File.separatorChar + "oldschool" + File.separatorChar); - if (var37.exists() && DevicePcmPlayerProvider.method847(new File(var37, "test.dat"), true)) { - var30 = var37.toString(); + var36 = new File(WorldMapSection2.cacheDirectoryLocations[var34] + Canvas.field94[var3] + File.separatorChar + "oldschool" + File.separatorChar); + if (var36.exists() && DevicePcmPlayerProvider.method847(new File(var36, "test.dat"), true)) { + var30 = var36.toString(); var32 = true; - break label237; + break label232; } } } } if (var30 == null) { - var30 = WorldMapSection1.userHomeDirectory + File.separatorChar + "jagexcache" + var28 + File.separatorChar + "oldschool" + File.separatorChar + var25 + File.separatorChar; + var30 = WorldMapSection1.userHomeDirectory + File.separatorChar + "jagexcache" + var28 + File.separatorChar + "oldschool" + File.separatorChar + var26 + File.separatorChar; var32 = true; } - File var15; - File var36; - File[] var38; - File[] var39; + File[] var16; + File var35; + File[] var37; if (var31 != null) { var36 = new File(var31); - var33 = new File(var30); + var12 = new File(var30); try { - var38 = var36.listFiles(); - var39 = var38; + var37 = var36.listFiles(); + var16 = var37; - for (var14 = 0; var14 < var39.length; ++var14) { - var15 = var39[var14]; - File var16 = new File(var33, var15.getName()); - boolean var17 = var15.renameTo(var16); - if (!var17) { + for (var11 = 0; var11 < var16.length; ++var11) { + var35 = var16[var11]; + File var17 = new File(var12, var35.getName()); + boolean var18 = var35.renameTo(var17); + if (!var18) { throw new IOException(); } } - } catch (Exception var21) { - var21.printStackTrace(); + } catch (Exception var22) { + var22.printStackTrace(); } var32 = true; @@ -2574,19 +2581,27 @@ public final class Client extends GameShell implements Usernamed { class168.field1115.mkdirs(); } - var38 = class168.field1115.listFiles(); - if (var38 != null) { - var39 = var38; - - for (var14 = 0; var14 < var39.length; ++var14) { - var15 = var39[var14]; - if (!DevicePcmPlayerProvider.method847(var15, false)) { - ++var27; - continue label262; - } - } + var37 = class168.field1115.listFiles(); + if (var37 == null) { + break; + } + + var16 = var37; + var11 = 0; + + while (true) { + if (var11 >= var16.length) { + break label256; + } + + var35 = var16[var11]; + if (!DevicePcmPlayerProvider.method847(var35, false)) { + ++var6; + break; + } + + ++var11; } - break; } File var29 = class168.field1115; @@ -2599,13 +2614,13 @@ public final class Client extends GameShell implements Usernamed { Interpreter.method1976(); class168.dat2File = new BufferedFile(new AccessFile(WorldMapIcon2.method315("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); class168.idx255File = new BufferedFile(new AccessFile(WorldMapIcon2.method315("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); - IndexStoreAction.idxFiles = new BufferedFile[class168.idxCount]; + ArchiveDiskAction.idxFiles = new BufferedFile[class168.idxCount]; - for (int var35 = 0; var35 < class168.idxCount; ++var35) { - IndexStoreAction.idxFiles[var35] = new BufferedFile(new AccessFile(WorldMapIcon2.method315("main_file_cache.idx" + var35), "rw", 1048576L), 6000, 0); + for (int var33 = 0; var33 < class168.idxCount; ++var33) { + ArchiveDiskAction.idxFiles[var33] = new BufferedFile(new AccessFile(WorldMapIcon2.method315("main_file_cache.idx" + var33), "rw", 1048576L), 6000, 0); } - } catch (Exception var23) { - NPCDefinition.sendStackTrace((String)null, var23); + } catch (Exception var24) { + NPCDefinition.sendStackTrace((String)null, var24); } TextureProvider.client = this; @@ -2614,7 +2629,7 @@ public final class Client extends GameShell implements Usernamed { break; } - ClientParameter var4 = var1[var3]; + ClientParameter var4 = var1[var2]; String var5 = this.getParameter(var4.id); if (var5 != null) { switch(Integer.parseInt(var4.id)) { @@ -2645,25 +2660,25 @@ public final class Client extends GameShell implements Usernamed { language = Integer.parseInt(var5); break; case 7: - int var6 = Integer.parseInt(var5); + var6 = Integer.parseInt(var5); ServerBuild[] var7 = new ServerBuild[]{ServerBuild.field786, ServerBuild.field787, ServerBuild.field784, ServerBuild.field785}; ServerBuild[] var8 = var7; - var2 = 0; + var3 = 0; ServerBuild var9; while (true) { - if (var2 >= var8.length) { + if (var3 >= var8.length) { var9 = null; break; } - ServerBuild var10 = var8[var2]; + ServerBuild var10 = var8[var3]; if (var6 == var10.id) { var9 = var10; break; } - ++var2; + ++var3; } class15.serverBuild = var9; @@ -2687,7 +2702,7 @@ public final class Client extends GameShell implements Usernamed { worldId = Integer.parseInt(var5); break; case 14: - AbstractIndexCache.field2 = Integer.parseInt(var5); + AbstractArchive.field2 = Integer.parseInt(var5); break; case 15: gameBuild = Integer.parseInt(var5); @@ -2697,12 +2712,12 @@ public final class Client extends GameShell implements Usernamed { } } - ++var3; + ++var2; } } - } catch (RuntimeException var24) { - throw Players.method2120(var24, "client.init()"); + } catch (RuntimeException var25) { + throw Players.method2120(var25, "client.init()"); } } @@ -2781,9 +2796,9 @@ public final class Client extends GameShell implements Usernamed { int var11; int var12; int var13; - byte[] var10000; - int var10001; - Buffer var24; + byte[] var14; + int var15; + Buffer var16; if (var9 > 0) { var10 = var9 - NetCache.NetCache_responseHeaderBuffer.index; if (var10 > var8) { @@ -2793,14 +2808,14 @@ public final class Client extends GameShell implements Usernamed { NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.index, var10); if (NetCache.field631 != 0) { for (var11 = 0; var11 < var10; ++var11) { - var10000 = NetCache.NetCache_responseHeaderBuffer.array; - var10001 = NetCache.NetCache_responseHeaderBuffer.index + var11; - var10000[var10001] ^= NetCache.field631; + var14 = NetCache.NetCache_responseHeaderBuffer.array; + var15 = NetCache.NetCache_responseHeaderBuffer.index + var11; + var14[var15] ^= NetCache.field631; } } - var24 = NetCache.NetCache_responseHeaderBuffer; - var24.index += var10; + var16 = NetCache.NetCache_responseHeaderBuffer; + var16.index += var10; if (NetCache.NetCache_responseHeaderBuffer.index < var9) { break; } @@ -2809,24 +2824,24 @@ public final class Client extends GameShell implements Usernamed { NetCache.NetCache_responseHeaderBuffer.index = 0; var11 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); var12 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); - int var14 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); + int var17 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); var13 = NetCache.NetCache_responseHeaderBuffer.readInt(); - long var15 = (long)(var12 + (var11 << 16)); - NetFileRequest var17 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var15); - WorldComparator.field988 = true; - if (var17 == null) { - var17 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var15); - WorldComparator.field988 = false; + long var18 = (long)(var12 + (var11 << 16)); + NetFileRequest var20 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var18); + GrandExchangeOfferWorldComparator.field988 = true; + if (var20 == null) { + var20 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var18); + GrandExchangeOfferWorldComparator.field988 = false; } - if (var17 == null) { + if (var20 == null) { throw new IOException(); } - int var18 = var14 == 0 ? 5 : 9; - ModelData0.NetCache_currentResponse = var17; - class22.NetCache_responseArchiveBuffer = new Buffer(var13 + var18 + ModelData0.NetCache_currentResponse.padding); - class22.NetCache_responseArchiveBuffer.writeByte(var14); + int var21 = var17 == 0 ? 5 : 9; + ModelData0.NetCache_currentResponse = var20; + class22.NetCache_responseArchiveBuffer = new Buffer(var13 + var21 + ModelData0.NetCache_currentResponse.padding); + class22.NetCache_responseArchiveBuffer.writeByte(var17); class22.NetCache_responseArchiveBuffer.writeInt(var13); NetCache.field630 = 8; NetCache.NetCache_responseHeaderBuffer.index = 0; @@ -2852,26 +2867,26 @@ public final class Client extends GameShell implements Usernamed { NetCache.NetCache_socket.read(class22.NetCache_responseArchiveBuffer.array, class22.NetCache_responseArchiveBuffer.index, var11); if (NetCache.field631 != 0) { for (var12 = 0; var12 < var11; ++var12) { - var10000 = class22.NetCache_responseArchiveBuffer.array; - var10001 = class22.NetCache_responseArchiveBuffer.index + var12; - var10000[var10001] ^= NetCache.field631; + var14 = class22.NetCache_responseArchiveBuffer.array; + var15 = class22.NetCache_responseArchiveBuffer.index + var12; + var14[var15] ^= NetCache.field631; } } - var24 = class22.NetCache_responseArchiveBuffer; - var24.index += var11; + var16 = class22.NetCache_responseArchiveBuffer; + var16.index += var11; NetCache.field630 += var11; if (var10 == class22.NetCache_responseArchiveBuffer.index) { if (16711935L == ModelData0.NetCache_currentResponse.key) { Players.NetCache_reference = class22.NetCache_responseArchiveBuffer; for (var12 = 0; var12 < 256; ++var12) { - IndexCache var22 = NetCache.NetCache_indexCaches[var12]; - if (var22 != null) { + Archive var25 = NetCache.NetCache_archives[var12]; + if (var25 != null) { Players.NetCache_reference.index = var12 * 8 + 5; var13 = Players.NetCache_reference.readInt(); - int var23 = Players.NetCache_reference.readInt(); - var22.loadIndexReference(var13, var23); + int var26 = Players.NetCache_reference.readInt(); + var25.loadIndex(var13, var26); } } } else { @@ -2881,7 +2896,7 @@ public final class Client extends GameShell implements Usernamed { if (var12 != ModelData0.NetCache_currentResponse.crc) { try { NetCache.NetCache_socket.close(); - } catch (Exception var20) { + } catch (Exception var23) { } ++NetCache.NetCache_crcMismatches; @@ -2893,11 +2908,11 @@ public final class Client extends GameShell implements Usernamed { NetCache.NetCache_crcMismatches = 0; NetCache.NetCache_ioExceptions = 0; - ModelData0.NetCache_currentResponse.indexCache.write((int)(ModelData0.NetCache_currentResponse.key & 65535L), class22.NetCache_responseArchiveBuffer.array, 16711680L == (ModelData0.NetCache_currentResponse.key & 16711680L), WorldComparator.field988); + ModelData0.NetCache_currentResponse.archive.write((int)(ModelData0.NetCache_currentResponse.key & 65535L), class22.NetCache_responseArchiveBuffer.array, 16711680L == (ModelData0.NetCache_currentResponse.key & 16711680L), GrandExchangeOfferWorldComparator.field988); } ModelData0.NetCache_currentResponse.remove(); - if (WorldComparator.field988) { + if (GrandExchangeOfferWorldComparator.field988) { --NetCache.NetCache_pendingPriorityResponsesCount; } else { --NetCache.NetCache_pendingResponsesCount; @@ -2918,10 +2933,10 @@ public final class Client extends GameShell implements Usernamed { var4 = true; } - } catch (IOException var21) { + } catch (IOException var24) { try { NetCache.NetCache_socket.close(); - } catch (Exception var19) { + } catch (Exception var22) { } ++NetCache.NetCache_ioExceptions; @@ -3085,7 +3100,7 @@ public final class Client extends GameShell implements Usernamed { garbageValue = "2348" ) @Export("js5Error") - void js5Error(int var1) { + void js5Error(int code) { class210.js5SocketTask = null; DynamicObject.js5Socket = null; js5ConnectState = 0; @@ -3096,8 +3111,8 @@ public final class Client extends GameShell implements Usernamed { } ++js5Errors; - if (js5Errors < 2 || var1 != 7 && var1 != 9) { - if (js5Errors >= 2 && var1 == 6) { + if (js5Errors < 2 || code != 7 && code != 9) { + if (js5Errors >= 2 && code == 6) { this.error("js5connect_outofdate"); gameState = 1000; } else if (js5Errors >= 4) { @@ -3189,34 +3204,34 @@ public final class Client extends GameShell implements Usernamed { loginState = 3; } - int var4; - boolean var16; + boolean var4; + int var16; if (loginState == 3) { if (WorldMapCacheName.pcmPlayer0 != null) { WorldMapCacheName.pcmPlayer0.method242(); } - if (AbstractIndexCache.pcmPlayer1 != null) { - AbstractIndexCache.pcmPlayer1.method242(); + if (AbstractArchive.pcmPlayer1 != null) { + AbstractArchive.pcmPlayer1.method242(); } - var16 = true; + var4 = true; if (useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) { - var16 = false; + var4 = false; } - if (var16) { - var4 = ((AbstractSocket)var1).readUnsignedByte(); + if (var4) { + var16 = ((AbstractSocket)var1).readUnsignedByte(); if (WorldMapCacheName.pcmPlayer0 != null) { WorldMapCacheName.pcmPlayer0.method242(); } - if (AbstractIndexCache.pcmPlayer1 != null) { - AbstractIndexCache.pcmPlayer1.method242(); + if (AbstractArchive.pcmPlayer1 != null) { + AbstractArchive.pcmPlayer1.method242(); } - if (var4 != 0) { - IsaacCipher.method4093(var4); + if (var16 != 0) { + IsaacCipher.method4093(var16); return; } @@ -3314,30 +3329,30 @@ public final class Client extends GameShell implements Usernamed { var8.packetBuffer.writeShort(Huffman.canvasHeight); Varps.method4400(var8.packetBuffer); var8.packetBuffer.writeStringCp1252NullTerminated(class21.field1123); - var8.packetBuffer.writeInt(AbstractIndexCache.field2); + var8.packetBuffer.writeInt(AbstractArchive.field2); Buffer var11 = new Buffer(WorldMapLabelSize.platformInfo.size()); WorldMapLabelSize.platformInfo.write(var11); var8.packetBuffer.method38(var11.array, 0, var11.array.length); var8.packetBuffer.writeByte(clientType); var8.packetBuffer.writeInt(0); - var8.packetBuffer.writeInt(AbstractIndexCache.indexCache0.hash); - var8.packetBuffer.writeInt(Skeleton.indexCache1.hash); - var8.packetBuffer.writeInt(ObjectSound.indexCache2.hash); - var8.packetBuffer.writeInt(WorldMapIcon1.indexCache3.hash); - var8.packetBuffer.writeInt(WorldMapDecoration.indexCache4.hash); - var8.packetBuffer.writeInt(SecureRandomFuture.indexCache5.hash); - var8.packetBuffer.writeInt(UserComparator3.indexCache6.hash); - var8.packetBuffer.writeInt(class40.indexCache7.hash); - var8.packetBuffer.writeInt(WorldMapSection3.indexCache8.hash); - var8.packetBuffer.writeInt(class238.indexCache9.hash); - var8.packetBuffer.writeInt(class16.indexCache10.hash); - var8.packetBuffer.writeInt(Login.indexCache11.hash); - var8.packetBuffer.writeInt(Formatting.indexCache12.hash); - var8.packetBuffer.writeInt(ByteArrayPool.indexCache13.hash); - var8.packetBuffer.writeInt(class2.indexCache14.hash); - var8.packetBuffer.writeInt(WorldMapSection1.indexCache15.hash); + var8.packetBuffer.writeInt(AbstractArchive.archive0.hash); + var8.packetBuffer.writeInt(Skeleton.archive1.hash); + var8.packetBuffer.writeInt(ObjectSound.archive2.hash); + var8.packetBuffer.writeInt(WorldMapIcon1.archive3.hash); + var8.packetBuffer.writeInt(WorldMapDecoration.archive4.hash); + var8.packetBuffer.writeInt(SecureRandomFuture.archive5.hash); + var8.packetBuffer.writeInt(UserComparator3.archive6.hash); + var8.packetBuffer.writeInt(class40.archive7.hash); + var8.packetBuffer.writeInt(WorldMapSection3.archive8.hash); + var8.packetBuffer.writeInt(class238.archive9.hash); + var8.packetBuffer.writeInt(class16.archive10.hash); + var8.packetBuffer.writeInt(Login.archive11.hash); + var8.packetBuffer.writeInt(Formatting.archive12.hash); + var8.packetBuffer.writeInt(ByteArrayPool.archive13.hash); + var8.packetBuffer.writeInt(class2.archive14.hash); + var8.packetBuffer.writeInt(WorldMapSection1.archive15.hash); var8.packetBuffer.writeInt(0); - var8.packetBuffer.writeInt(class22.indexCache16.hash); + var8.packetBuffer.writeInt(class22.archive16.hash); var8.packetBuffer.writeInt(WorldMapLabelSize.field1040.hash); var8.packetBuffer.writeInt(ItemContainer.field434.hash); var8.packetBuffer.writeInt(AbstractByteArrayCopier.field0.hash); @@ -3409,15 +3424,15 @@ public final class Client extends GameShell implements Usernamed { } if (loginState == 12 && ((AbstractSocket)var1).available() >= field171) { - var16 = ((AbstractSocket)var1).readUnsignedByte() == 1; + var4 = ((AbstractSocket)var1).readUnsignedByte() == 1; ((AbstractSocket)var1).read(var2.array, 0, 4); var2.index = 0; boolean var17 = false; - if (var16) { - var4 = var2.readByteIsaac() << 24; - var4 |= var2.readByteIsaac() << 16; - var4 |= var2.readByteIsaac() << 8; - var4 |= var2.readByteIsaac(); + if (var4) { + var16 = var2.readByteIsaac() << 24; + var16 |= var2.readByteIsaac() << 16; + var16 |= var2.readByteIsaac() << 8; + var16 |= var2.readByteIsaac(); int var20 = class279.method5357(Login.Login_username); if (ReflectionCheck.clientPreferences.parameters.size() >= 10 && !ReflectionCheck.clientPreferences.parameters.containsKey(var20)) { Iterator var23 = ReflectionCheck.clientPreferences.parameters.entrySet().iterator(); @@ -3425,7 +3440,7 @@ public final class Client extends GameShell implements Usernamed { var23.remove(); } - ReflectionCheck.clientPreferences.parameters.put(var20, var4); + ReflectionCheck.clientPreferences.parameters.put(var20, var16); } if (Login_isUsernameRemembered) { @@ -3435,8 +3450,8 @@ public final class Client extends GameShell implements Usernamed { } WorldMapSection0.savePreferences(); - rights = ((AbstractSocket)var1).readUnsignedByte(); - field155 = ((AbstractSocket)var1).readUnsignedByte() == 1; + staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); + playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); localPlayerIndex <<= 8; localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); @@ -3470,7 +3485,7 @@ public final class Client extends GameShell implements Usernamed { ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacket0Length); timer.method332(); WorldMapSection1.method808(); - class11.updatePlayer(var2); + GrandExchangeOfferNameComparator.updatePlayer(var2); GameObject.field359 = -1; class50.loadRegions(false, var2); packetWriter.serverPacket0 = null; @@ -3480,13 +3495,13 @@ public final class Client extends GameShell implements Usernamed { var2.index = 0; ((AbstractSocket)var1).read(var2.array, 0, 2); var2.index = 0; - IndexCacheLoader.field407 = var2.readUnsignedShort(); + ArchiveLoader.field407 = var2.readUnsignedShort(); loginState = 15; } - if (loginState == 15 && ((AbstractSocket)var1).available() >= IndexCacheLoader.field407) { + if (loginState == 15 && ((AbstractSocket)var1).available() >= ArchiveLoader.field407) { var2.index = 0; - ((AbstractSocket)var1).read(var2.array, 0, IndexCacheLoader.field407); + ((AbstractSocket)var1).read(var2.array, 0, ArchiveLoader.field407); var2.index = 0; String var18 = var2.readStringCp1252NullTerminated(); String var22 = var2.readStringCp1252NullTerminated(); @@ -3541,14 +3556,14 @@ public final class Client extends GameShell implements Usernamed { minimapState = 0; destinationX = 0; - for (var4 = 0; var4 < 2048; ++var4) { - players[var4] = null; + for (var16 = 0; var16 < 2048; ++var16) { + players[var16] = null; } Canvas.localPlayer = null; - for (var4 = 0; var4 < npcs.length; ++var4) { - NPC var19 = npcs[var4]; + for (var16 = 0; var16 < npcs.length; ++var16) { + NPC var19 = npcs[var16]; if (var19 != null) { var19.targetIndex = -1; var19.false0 = false; @@ -3558,12 +3573,12 @@ public final class Client extends GameShell implements Usernamed { SpriteMask.method4389(); GameShell.updateGameState(30); - for (var4 = 0; var4 < 100; ++var4) { - field100[var4] = true; + for (var16 = 0; var16 < 100; ++var16) { + field100[var16] = true; } AbstractByteArrayCopier.method4024(); - class11.updatePlayer(var2); + GrandExchangeOfferNameComparator.updatePlayer(var2); if (var5 != var2.index) { throw new RuntimeException(); } @@ -3681,8 +3696,8 @@ public final class Client extends GameShell implements Usernamed { var5 = Interpreter.method1915(ClientPacket.field256, packetWriter.isaacCipher); var5.packetBuffer.writeByte(0); var4 = var5.packetBuffer.index; - PacketBuffer var10000 = var5.packetBuffer; - var10000.index += 2; + PacketBuffer var19 = var5.packetBuffer; + var19.index += 2; var10 = 0; var11 = 0; } @@ -3743,8 +3758,8 @@ public final class Client extends GameShell implements Usernamed { if (var9 >= Projectile.mouseRecorder.index) { Projectile.mouseRecorder.index = 0; } else { - MouseRecorder var36 = Projectile.mouseRecorder; - var36.index -= var9; + MouseRecorder var32 = Projectile.mouseRecorder; + var32.index -= var9; System.arraycopy(Projectile.mouseRecorder.xs, var9, Projectile.mouseRecorder.xs, 0, Projectile.mouseRecorder.index); System.arraycopy(Projectile.mouseRecorder.ys, var9, Projectile.mouseRecorder.ys, 0, Projectile.mouseRecorder.index); System.arraycopy(Projectile.mouseRecorder.millis, var9, Projectile.mouseRecorder.millis, 0, Projectile.mouseRecorder.index); @@ -3753,11 +3768,11 @@ public final class Client extends GameShell implements Usernamed { } PacketBufferNode var18; - long var19; + long var33; if (MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { - var19 = (MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis * -1L) / 50L; - if (var19 > 4095L) { - var19 = 4095L; + var33 = (MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis * -1L) / 50L; + if (var33 > 4095L) { + var33 = 4095L; } mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis * -1L; @@ -3775,7 +3790,7 @@ public final class Client extends GameShell implements Usernamed { var9 = SoundCache.canvasWidth; } - var10 = (int)var19; + var10 = (int)var33; var18 = Interpreter.method1915(ClientPacket.field263, packetWriter.isaacCipher); var18.packetBuffer.writeShort((var10 << 1) + (MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0)); var18.packetBuffer.writeShort(var9); @@ -3787,15 +3802,15 @@ public final class Client extends GameShell implements Usernamed { var6 = Interpreter.method1915(ClientPacket.field289, packetWriter.isaacCipher); var6.packetBuffer.writeShort(0); var7 = var6.packetBuffer.index; - var19 = class203.currentTimeMs(); + var33 = class203.currentTimeMs(); for (var10 = 0; var10 < KeyHandler.field452; ++var10) { - long var21 = var19 - field126; + long var21 = var33 - field126; if (var21 > 16777215L) { var21 = 16777215L; } - field126 = var19; + field126 = var33; var6.packetBuffer.method56(KeyHandler.field451[var10]); var6.packetBuffer.writeMedium((int)var21); } @@ -3816,8 +3831,8 @@ public final class Client extends GameShell implements Usernamed { field200 = 20; field201 = false; var6 = Interpreter.method1915(ClientPacket.field261, packetWriter.isaacCipher); - var6.packetBuffer.method64(cameraPitchTarget); - var6.packetBuffer.writeShortLE(minimapOrientation); + var6.packetBuffer.method64(camAngleX); + var6.packetBuffer.writeShortLE(camAngleY); packetWriter.method241(var6); } @@ -3854,20 +3869,20 @@ public final class Client extends GameShell implements Usernamed { } var1 = Players.Players_count; - int[] var30 = Players.Players_indices; + int[] var34 = Players.Players_indices; for (var4 = 0; var4 < var1; ++var4) { - Player var20 = players[var30[var4]]; - if (var20 != null) { - class65.method1232(var20, 1); + Player var22 = players[var34[var4]]; + if (var22 != null) { + class65.method1232(var22, 1); } } for (var1 = 0; var1 < npcCount; ++var1) { var7 = npcIndices[var1]; - NPC var31 = npcs[var7]; - if (var31 != null) { - class65.method1232(var31, var31.definition.size); + NPC var35 = npcs[var7]; + if (var35 != null) { + class65.method1232(var35, var35.definition.size); } } @@ -3888,8 +3903,8 @@ public final class Client extends GameShell implements Usernamed { } } - Widget var32 = Clock.mousedOverWidgetIf1; - Widget var33 = AccessFile.field8; + Widget var36 = Clock.mousedOverWidgetIf1; + Widget var23 = AccessFile.field8; Clock.mousedOverWidgetIf1 = null; AccessFile.field8 = null; draggedOnWidget = null; @@ -3898,11 +3913,11 @@ public final class Client extends GameShell implements Usernamed { field137 = 0; while (Decimator.method2490() && field137 < 128) { - if (rights >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && IndexStoreAction.field411 == 66) { - String var22 = KeyHandler.method839(); - TextureProvider.client.clipboardSetString(var22); + if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && ArchiveDiskAction.field411 == 66) { + String var24 = KeyHandler.method839(); + TextureProvider.client.clipboardSetString(var24); } else if (oculusOrbState != 1 || GzipDecompressor.field378 <= 0) { - field145[field137] = IndexStoreAction.field411; + field145[field137] = ArchiveDiskAction.field411; field146[field137] = GzipDecompressor.field378; ++field137; } @@ -3930,88 +3945,88 @@ public final class Client extends GameShell implements Usernamed { mouseWheelRotation = 0; } - if (rootWidgetGroup != -1) { - WorldMapDecorationType.method4517(rootWidgetGroup, 0, 0, SoundCache.canvasWidth, Huffman.canvasHeight, 0, 0); + if (rootInterface != -1) { + WorldMapDecorationType.method4517(rootInterface, 0, 0, SoundCache.canvasWidth, Huffman.canvasHeight, 0, 0); } ++cycleCntr; while (true) { - Widget var23; - ScriptEvent var24; - Widget var34; + ScriptEvent var25; + Widget var26; + Widget var37; do { - var24 = (ScriptEvent)field147.removeLast(); - if (var24 == null) { + var25 = (ScriptEvent)field147.removeLast(); + if (var25 == null) { while (true) { do { - var24 = (ScriptEvent)field148.removeLast(); - if (var24 == null) { + var25 = (ScriptEvent)field148.removeLast(); + if (var25 == null) { while (true) { do { - var24 = (ScriptEvent)scriptEvents.removeLast(); - if (var24 == null) { + var25 = (ScriptEvent)scriptEvents.removeLast(); + if (var25 == null) { this.method86(); WorldMapSectionType.method254(); if (clickedWidget != null) { this.method88(); } - PacketBufferNode var25; + PacketBufferNode var27; if (DevicePcmPlayerProvider.dragInventoryWidget != null) { class22.method295(DevicePcmPlayerProvider.dragInventoryWidget); ++itemDragDuration; if (MouseHandler.MouseHandler_currentButton == 0) { if (field207) { if (UserComparator6.field937 == DevicePcmPlayerProvider.dragInventoryWidget && dragItemSlotSource != dragItemSlotDestination) { - Widget var26 = DevicePcmPlayerProvider.dragInventoryWidget; - byte var27 = 0; - if (field136 == 1 && var26.contentType == 206) { - var27 = 1; + Widget var28 = DevicePcmPlayerProvider.dragInventoryWidget; + byte var29 = 0; + if (field136 == 1 && var28.contentType == 206) { + var29 = 1; } - if (var26.itemIds[dragItemSlotDestination] <= 0) { - var27 = 0; + if (var28.itemIds[dragItemSlotDestination] <= 0) { + var29 = 0; } - if (class168.method3461(class1.getWidgetClickMask(var26))) { + if (class168.method3461(class1.getWidgetClickMask(var28))) { var10 = dragItemSlotSource; var11 = dragItemSlotDestination; - var26.itemIds[var11] = var26.itemIds[var10]; - var26.itemQuantities[var11] = var26.itemQuantities[var10]; - var26.itemIds[var10] = -1; - var26.itemQuantities[var10] = 0; - } else if (var27 == 1) { + var28.itemIds[var11] = var28.itemIds[var10]; + var28.itemQuantities[var11] = var28.itemQuantities[var10]; + var28.itemIds[var10] = -1; + var28.itemQuantities[var10] = 0; + } else if (var29 == 1) { var10 = dragItemSlotSource; var11 = dragItemSlotDestination; while (var10 != var11) { if (var10 > var11) { - var26.swapItems(var10 - 1, var10); + var28.swapItems(var10 - 1, var10); --var10; } else if (var10 < var11) { - var26.swapItems(var10 + 1, var10); + var28.swapItems(var10 + 1, var10); ++var10; } } } else { - var26.swapItems(dragItemSlotDestination, dragItemSlotSource); + var28.swapItems(dragItemSlotDestination, dragItemSlotSource); } - var25 = Interpreter.method1915(ClientPacket.field302, packetWriter.isaacCipher); - var25.packetBuffer.writeShort(dragItemSlotDestination); - var25.packetBuffer.writeShortLE(dragItemSlotSource); - var25.packetBuffer.writeInt(DevicePcmPlayerProvider.dragInventoryWidget.id); - var25.packetBuffer.method56(var27); - packetWriter.method241(var25); + var27 = Interpreter.method1915(ClientPacket.field302, packetWriter.isaacCipher); + var27.packetBuffer.writeShort(dragItemSlotDestination); + var27.packetBuffer.writeShortLE(dragItemSlotSource); + var27.packetBuffer.writeInt(DevicePcmPlayerProvider.dragInventoryWidget.id); + var27.packetBuffer.method56(var29); + packetWriter.method241(var27); } } else if (this.shouldLeftClickOpenMenu()) { this.openMenu(field205, field206); } else if (menuOptionsCount > 0) { var4 = field205; var9 = field206; - WorldMapDecorationType.processTempMenuAction(UnitPriceComparator.tempMenuAction, var4, var9); - UnitPriceComparator.tempMenuAction = null; + WorldMapDecorationType.processTempMenuAction(GrandExchangeOfferUnitPriceComparator.tempMenuAction, var4, var9); + GrandExchangeOfferUnitPriceComparator.tempMenuAction = null; } field203 = 10; @@ -4025,12 +4040,12 @@ public final class Client extends GameShell implements Usernamed { if (Scene.method3187()) { var4 = Scene.Scene_selectedX; var9 = Scene.Scene_selectedY; - var25 = Interpreter.method1915(ClientPacket.field318, packetWriter.isaacCipher); - var25.packetBuffer.writeByte(5); - var25.packetBuffer.method63(var9 + GraphicsObject.baseY); - var25.packetBuffer.method63(var4 + class50.baseX); - var25.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); - packetWriter.method241(var25); + var27 = Interpreter.method1915(ClientPacket.field318, packetWriter.isaacCipher); + var27.packetBuffer.writeByte(5); + var27.packetBuffer.method63(var9 + GraphicsObject.baseY); + var27.packetBuffer.method63(var4 + class50.baseX); + var27.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); + packetWriter.method241(var27); Scene.method3103(); mouseCrossX = MouseHandler.MouseHandler_lastPressedX; mouseCrossY = MouseHandler.MouseHandler_lastPressedY; @@ -4040,9 +4055,9 @@ public final class Client extends GameShell implements Usernamed { destinationY = var9; } - if (var32 != Clock.mousedOverWidgetIf1) { - if (var32 != null) { - class22.method295(var32); + if (var36 != Clock.mousedOverWidgetIf1) { + if (var36 != null) { + class22.method295(var36); } if (Clock.mousedOverWidgetIf1 != null) { @@ -4050,9 +4065,9 @@ public final class Client extends GameShell implements Usernamed { } } - if (var33 != AccessFile.field8 && field218 == field219) { - if (var33 != null) { - class22.method295(var33); + if (var23 != AccessFile.field8 && field218 == field219) { + if (var23 != null) { + class22.method295(var23); } if (AccessFile.field8 != null) { @@ -4104,26 +4119,26 @@ public final class Client extends GameShell implements Usernamed { } } - if (class11.cameraZ < var9) { - class11.cameraZ = (var9 - class11.cameraZ) * class30.field1148 / 1000 + class11.cameraZ + ClientPacket.field221; - if (class11.cameraZ > var9) { - class11.cameraZ = var9; + if (GrandExchangeOfferNameComparator.cameraZ < var9) { + GrandExchangeOfferNameComparator.cameraZ = (var9 - GrandExchangeOfferNameComparator.cameraZ) * class30.field1148 / 1000 + GrandExchangeOfferNameComparator.cameraZ + ClientPacket.field221; + if (GrandExchangeOfferNameComparator.cameraZ > var9) { + GrandExchangeOfferNameComparator.cameraZ = var9; } } - if (class11.cameraZ > var9) { - class11.cameraZ -= class30.field1148 * (class11.cameraZ - var9) / 1000 + ClientPacket.field221; - if (class11.cameraZ < var9) { - class11.cameraZ = var9; + if (GrandExchangeOfferNameComparator.cameraZ > var9) { + GrandExchangeOfferNameComparator.cameraZ -= class30.field1148 * (GrandExchangeOfferNameComparator.cameraZ - var9) / 1000 + ClientPacket.field221; + if (GrandExchangeOfferNameComparator.cameraZ < var9) { + GrandExchangeOfferNameComparator.cameraZ = var9; } } var4 = GrandExchangeOffer.field376 * 128 + 64; var9 = KeyHandler.field445 * 128 + 64; - var10 = class32.getTileHeight(var4, var9, SoundSystem.plane) - IndexStoreAction.field410; + var10 = class32.getTileHeight(var4, var9, SoundSystem.plane) - ArchiveDiskAction.field410; var11 = var4 - WorldMapSection1.cameraX; var12 = var10 - GrandExchangeEvents.cameraY; - var13 = var9 - class11.cameraZ; + var13 = var9 - GrandExchangeOfferNameComparator.cameraZ; var14 = (int)Math.sqrt((double)(var13 * var13 + var11 * var11)); var15 = (int)(Math.atan2((double)var12, (double)var14) * 325.949D) & 2047; var16 = (int)(Math.atan2((double)var11, (double)var13) * -325.949D) & 2047; @@ -4168,22 +4183,22 @@ public final class Client extends GameShell implements Usernamed { MusicPatchNode.cameraYaw &= 2047; } - int var35 = var16 - MusicPatchNode.cameraYaw; - if (var35 > 1024) { - var35 -= 2048; + int var38 = var16 - MusicPatchNode.cameraYaw; + if (var38 > 1024) { + var38 -= 2048; } - if (var35 < -1024) { - var35 += 2048; + if (var38 < -1024) { + var38 += 2048; } - if (var35 < 0 && var17 > 0 || var35 > 0 && var17 < 0) { + if (var38 < 0 && var17 > 0 || var38 > 0 && var17 < 0) { MusicPatchNode.cameraYaw = var16; } } for (var4 = 0; var4 < 5; ++var4) { - int var10002 = field144[var4]++; + int var10003 = field144[var4]++; } class196.varcs.tryWrite(); @@ -4205,46 +4220,46 @@ public final class Client extends GameShell implements Usernamed { try { packetWriter.method240(); - } catch (IOException var28) { + } catch (IOException var30) { class48.method868(); } return; } - var23 = var24.widget; - if (var23.childIndex < 0) { + var37 = var25.widget; + if (var37.childIndex < 0) { break; } - var34 = Huffman.getWidget(var23.parentId); - } while(var34 == null || var34.children == null || var23.childIndex >= var34.children.length || var23 != var34.children[var23.childIndex]); + var26 = Huffman.getWidget(var37.parentId); + } while(var26 == null || var26.children == null || var37.childIndex >= var26.children.length || var37 != var26.children[var37.childIndex]); - AbstractIndexCache.runScript(var24); + AbstractArchive.runScript(var25); } } - var23 = var24.widget; - if (var23.childIndex < 0) { + var37 = var25.widget; + if (var37.childIndex < 0) { break; } - var34 = Huffman.getWidget(var23.parentId); - } while(var34 == null || var34.children == null || var23.childIndex >= var34.children.length || var23 != var34.children[var23.childIndex]); + var26 = Huffman.getWidget(var37.parentId); + } while(var26 == null || var26.children == null || var37.childIndex >= var26.children.length || var37 != var26.children[var37.childIndex]); - AbstractIndexCache.runScript(var24); + AbstractArchive.runScript(var25); } } - var23 = var24.widget; - if (var23.childIndex < 0) { + var37 = var25.widget; + if (var37.childIndex < 0) { break; } - var34 = Huffman.getWidget(var23.parentId); - } while(var34 == null || var34.children == null || var23.childIndex >= var34.children.length || var23 != var34.children[var23.childIndex]); + var26 = Huffman.getWidget(var37.parentId); + } while(var26 == null || var26.children == null || var37.childIndex >= var26.children.length || var37 != var26.children[var37.childIndex]); - AbstractIndexCache.runScript(var24); + AbstractArchive.runScript(var25); } } @@ -4279,7 +4294,7 @@ public final class Client extends GameShell implements Usernamed { if (ReflectionCheck.clientPreferences != null) { try { Client var3 = TextureProvider.client; - Object[] var4 = new Object[]{SpotAnimationDefinition.method4822()}; + Object[] var4 = new Object[]{SpotAnimationDefinition.getWindowedMode()}; JSObject.getWindow(var3).call("resize", var4); } catch (Throwable var5) { } @@ -4294,8 +4309,8 @@ public final class Client extends GameShell implements Usernamed { ) @Export("drawLoggedIn") final void drawLoggedIn() { - if (rootWidgetGroup != -1) { - ClientPreferences.method1809(rootWidgetGroup); + if (rootInterface != -1) { + ClientPreferences.method1809(rootInterface); } int var1; @@ -4312,9 +4327,9 @@ public final class Client extends GameShell implements Usernamed { field216 = -1; field217 = -1; UserComparator6.field937 = null; - if (rootWidgetGroup != -1) { + if (rootInterface != -1) { rootWidgetCount = 0; - Interpreter.drawWidgets(rootWidgetGroup, 0, 0, SoundCache.canvasWidth, Huffman.canvasHeight, 0, 0, -1); + Interpreter.drawWidgets(rootInterface, 0, 0, SoundCache.canvasWidth, Huffman.canvasHeight, 0, 0, -1); } Rasterizer2D.Rasterizer2D_resetClip(); @@ -4429,7 +4444,7 @@ public final class Client extends GameShell implements Usernamed { if (var13.stream1 == null) { if (var13.soundEffectId >= 0) { var14 = null; - var16 = SoundEffect.readSoundEffect(WorldMapDecoration.indexCache4, var13.soundEffectId, 0); + var16 = SoundEffect.readSoundEffect(WorldMapDecoration.archive4, var13.soundEffectId, 0); if (var16 != null) { var17 = var16.toRawSound().resample(MilliClock.decimator); var19 = RawPcmStream.createRawPcmStream(var17, 100, var6); @@ -4446,7 +4461,7 @@ public final class Client extends GameShell implements Usernamed { if (var13.soundEffectIds != null && (var13.field655 -= var4) <= 0) { var7 = (int)(Math.random() * (double)var13.soundEffectIds.length); var14 = null; - var16 = SoundEffect.readSoundEffect(WorldMapDecoration.indexCache4, var13.soundEffectIds[var7], 0); + var16 = SoundEffect.readSoundEffect(WorldMapDecoration.archive4, var13.soundEffectIds[var7], 0); if (var16 != null) { var17 = var16.toRawSound().resample(MilliClock.decimator); var19 = RawPcmStream.createRawPcmStream(var17, 100, var6); @@ -4571,25 +4586,25 @@ public final class Client extends GameShell implements Usernamed { class30.field1148 = var3.readUnsignedByte(); if (class30.field1148 >= 100) { WorldMapSection1.cameraX = class3.field1146 * 128 + 64; - class11.cameraZ = MusicPatchPcmStream.field602 * 128 + 64; - GrandExchangeEvents.cameraY = class32.getTileHeight(WorldMapSection1.cameraX, class11.cameraZ, SoundSystem.plane) - AbstractWorldMapIcon.field4; + GrandExchangeOfferNameComparator.cameraZ = MusicPatchPcmStream.field602 * 128 + 64; + GrandExchangeEvents.cameraY = class32.getTileHeight(WorldMapSection1.cameraX, GrandExchangeOfferNameComparator.cameraZ, SoundSystem.plane) - AbstractWorldMapIcon.field4; } var1.serverPacket0 = null; return true; } - int var37; + int var38; if (ServerPacket.field817 == var1.serverPacket0) { - for (var37 = 0; var37 < players.length; ++var37) { - if (players[var37] != null) { - players[var37].sequence = -1; + for (var38 = 0; var38 < players.length; ++var38) { + if (players[var38] != null) { + players[var38].sequence = -1; } } - for (var37 = 0; var37 < npcs.length; ++var37) { - if (npcs[var37] != null) { - npcs[var37].sequence = -1; + for (var38 = 0; var38 < npcs.length; ++var38) { + if (npcs[var38] != null) { + npcs[var38].sequence = -1; } } @@ -4602,9 +4617,9 @@ public final class Client extends GameShell implements Usernamed { WorldMapSection3.field1089 = var3.readUnsignedByteNegate(); while (var3.index < var1.serverPacket0Length) { - var37 = var3.readUnsignedByte(); - class190 var38 = RunException.method3430()[var37]; - class16.method189(var38); + var38 = var3.readUnsignedByte(); + class190 var39 = RunException.method3430()[var38]; + class16.method189(var39); } var1.serverPacket0 = null; @@ -4613,11 +4628,11 @@ public final class Client extends GameShell implements Usernamed { Widget var8; if (ServerPacket.field850 == var1.serverPacket0) { - var37 = var3.method44(); + var38 = var3.method44(); var6 = var3.method73(); var8 = Huffman.getWidget(var6); - if (var37 != var8.sequenceId || var37 == -1) { - var8.sequenceId = var37; + if (var38 != var8.sequenceId || var38 == -1) { + var8.sequenceId = var38; var8.modelFrame = 0; var8.modelFrameCycle = 0; class22.method295(var8); @@ -4629,8 +4644,8 @@ public final class Client extends GameShell implements Usernamed { Widget var9; if (ServerPacket.field819 == var1.serverPacket0) { - var37 = var3.method73(); - var9 = Huffman.getWidget(var37); + var38 = var3.method73(); + var9 = Huffman.getWidget(var38); var9.modelType = 3; var9.modelId = Canvas.localPlayer.appearance.getChatHeadId(); class22.method295(var9); @@ -4645,8 +4660,8 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field796 == var1.serverPacket0) { - var37 = var3.method72(); - var9 = Huffman.getWidget(var37); + var38 = var3.method72(); + var9 = Huffman.getWidget(var38); for (var5 = 0; var5 < var9.itemIds.length; ++var5) { var9.itemIds[var5] = -1; @@ -4663,14 +4678,14 @@ public final class Client extends GameShell implements Usernamed { int var12; int var13; if (ServerPacket.field859 == var1.serverPacket0) { - var37 = var3.readInt(); + var38 = var3.readInt(); var6 = var3.readUnsignedShort(); - if (var37 < -70000) { + if (var38 < -70000) { var6 += 32768; } - if (var37 >= 0) { - var8 = Huffman.getWidget(var37); + if (var38 >= 0) { + var8 = Huffman.getWidget(var38); } else { var8 = null; } @@ -4704,7 +4719,7 @@ public final class Client extends GameShell implements Usernamed { class22.method295(var8); } - class12.method159(); + GrandExchangeOfferAgeComparator.method159(); field116[++field117 - 1 & 31] = var6 & 32767; var1.serverPacket0 = null; return true; @@ -4731,9 +4746,9 @@ public final class Client extends GameShell implements Usernamed { boolean var14; if (ServerPacket.field810 == var1.serverPacket0) { - var37 = var3.readInt(); + var38 = var3.readInt(); var14 = var3.readUnsignedByte() == 1; - var8 = Huffman.getWidget(var37); + var8 = Huffman.getWidget(var38); if (var14 != var8.isHidden) { var8.isHidden = var14; class22.method295(var8); @@ -4744,14 +4759,14 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field852 == var1.serverPacket0) { - byte var39 = var3.method60(); + byte var40 = var3.method60(); var6 = var3.method66(); - Varps.Varps_temp[var6] = var39; - if (Varps.Varps_main[var6] != var39) { - Varps.Varps_main[var6] = var39; + Varps.Varps_temp[var6] = var40; + if (Varps.Varps_main[var6] != var40) { + Varps.Varps_main[var6] = var40; } - IndexCache.method4703(var6); + Archive.method4703(var6); field121[++field123 - 1 & 31] = var6; var1.serverPacket0 = null; return true; @@ -4764,13 +4779,13 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field844 == var1.serverPacket0) { - var37 = var3.readUnsignedByte(); + var38 = var3.readUnsignedByte(); if (var3.readUnsignedByte() == 0) { - grandExchangeOffers[var37] = new GrandExchangeOffer(); + grandExchangeOffers[var38] = new GrandExchangeOffer(); var3.index += 18; } else { --var3.index; - grandExchangeOffers[var37] = new GrandExchangeOffer(var3, false); + grandExchangeOffers[var38] = new GrandExchangeOffer(var3, false); } field122 = cycleCntr; @@ -4779,11 +4794,11 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field873 == var1.serverPacket0) { - var37 = var3.method67(); - rootWidgetGroup = var37; + var38 = var3.method67(); + rootInterface = var38; this.method87(false); - DevicePcmPlayerProvider.method845(var37); - WorldMapSection3.runWidgetOnLoadListener(rootWidgetGroup); + DevicePcmPlayerProvider.method845(var38); + WorldMapSection3.runWidgetOnLoadListener(rootInterface); for (var6 = 0; var6 < 100; ++var6) { field100[var6] = true; @@ -4794,7 +4809,7 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field849 == var1.serverPacket0) { - class12.method159(); + GrandExchangeOfferAgeComparator.method159(); runEnergy = var3.readUnsignedByte(); field124 = cycleCntr; var1.serverPacket0 = null; @@ -4803,13 +4818,13 @@ public final class Client extends GameShell implements Usernamed { Widget var15; if (ServerPacket.field839 == var1.serverPacket0) { - var37 = var3.method67(); + var38 = var3.method67(); var6 = var3.method67(); var5 = var3.method67(); var10 = var3.method73(); var15 = Huffman.getWidget(var10); - if (var37 != var15.modelAngleX || var5 != var15.modelAngleY || var6 != var15.modelZoom) { - var15.modelAngleX = var37; + if (var38 != var15.modelAngleX || var5 != var15.modelAngleY || var6 != var15.modelZoom) { + var15.modelAngleX = var38; var15.modelAngleY = var5; var15.modelZoom = var6; class22.method295(var15); @@ -4880,18 +4895,18 @@ public final class Client extends GameShell implements Usernamed { Widget var16; if (ServerPacket.field830 == var1.serverPacket0) { - var37 = var3.method66(); + var38 = var3.method66(); var6 = var3.method65(); var5 = var3.method72(); var16 = Huffman.getWidget(var5); - var16.field963 = var37 + (var6 << 16); + var16.field963 = var38 + (var6 << 16); var1.serverPacket0 = null; return true; } if (ServerPacket.field841 == var1.serverPacket0) { - if (rootWidgetGroup != -1) { - GrandExchangeEvents.method74(rootWidgetGroup, 0); + if (rootInterface != -1) { + GrandExchangeEvents.method74(rootInterface, 0); } var1.serverPacket0 = null; @@ -4899,15 +4914,15 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field809 == var1.serverPacket0) { - var37 = var3.readInt(); + var38 = var3.readInt(); var6 = var3.readUnsignedShort(); if (var6 == 65535) { var6 = -1; } var5 = var3.method73(); - var16 = Huffman.getWidget(var37); - ItemDefinition var40; + var16 = Huffman.getWidget(var38); + ItemDefinition var41; if (!var16.isIf3) { if (var6 == -1) { var16.modelType = 0; @@ -4915,24 +4930,24 @@ public final class Client extends GameShell implements Usernamed { return true; } - var40 = Skills.getItemDefinition(var6); + var41 = Skills.getItemDefinition(var6); var16.modelType = 4; var16.modelId = var6; - var16.modelAngleX = var40.xan2d; - var16.modelAngleY = var40.yan2d; - var16.modelZoom = var40.zoom2d * 100 / var5; + var16.modelAngleX = var41.xan2d; + var16.modelAngleY = var41.yan2d; + var16.modelZoom = var41.zoom2d * 100 / var5; class22.method295(var16); } else { var16.itemId = var6; var16.itemQuantity = var5; - var40 = Skills.getItemDefinition(var6); - var16.modelAngleX = var40.xan2d; - var16.modelAngleY = var40.yan2d; - var16.modelAngleZ = var40.zan2d; - var16.modelOffsetX = var40.offsetX2d; - var16.modelOffsetY = var40.offsetY2d; - var16.modelZoom = var40.zoom2d; - if (var40.isStackable == 1) { + var41 = Skills.getItemDefinition(var6); + var16.modelAngleX = var41.xan2d; + var16.modelAngleY = var41.yan2d; + var16.modelAngleZ = var41.zan2d; + var16.modelOffsetX = var41.offsetX2d; + var16.modelOffsetY = var41.offsetY2d; + var16.modelZoom = var41.zoom2d; + if (var41.isStackable == 1) { var16.itemQuantityMode = 1; } else { var16.itemQuantityMode = 2; @@ -4954,7 +4969,7 @@ public final class Client extends GameShell implements Usernamed { String var17; boolean var18; if (ServerPacket.field792 == var1.serverPacket0) { - var37 = var3.method48(); + var38 = var3.method48(); var14 = var3.readUnsignedByte() == 1; var17 = ""; var18 = false; @@ -4965,9 +4980,9 @@ public final class Client extends GameShell implements Usernamed { } } - String var41 = var3.readStringCp1252NullTerminated(); + String var42 = var3.readStringCp1252NullTerminated(); if (!var18) { - WorldMapIcon1.method219(var37, var17, var41); + WorldMapIcon1.addGameMessage(var38, var17, var42); } var1.serverPacket0 = null; @@ -4975,7 +4990,7 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field857 == var1.serverPacket0) { - IndexCacheLoader.field512 = WorldMapElement.method4783(var3.readUnsignedByte()); + ArchiveLoader.field512 = WorldMapElement.method4783(var3.readUnsignedByte()); var1.serverPacket0 = null; return true; } @@ -5002,7 +5017,7 @@ public final class Client extends GameShell implements Usernamed { long var19; if (ServerPacket.field837 == var1.serverPacket0) { - var37 = var3.method71(); + var38 = var3.method71(); var6 = var3.method66(); if (var6 == 65535) { var6 = -1; @@ -5016,12 +5031,12 @@ public final class Client extends GameShell implements Usernamed { for (var11 = var10; var11 <= var6; ++var11) { var19 = (long)var11 + ((long)var5 << 32); - Node var42 = widgetClickMasks.get(var19); - if (var42 != null) { - var42.remove(); + Node var43 = widgetClickMasks.get(var19); + if (var43 != null) { + var43.remove(); } - widgetClickMasks.put(new IntegerNode(var37), var19); + widgetClickMasks.put(new IntegerNode(var38), var19); } var1.serverPacket0 = null; @@ -5053,20 +5068,20 @@ public final class Client extends GameShell implements Usernamed { String var21; if (ServerPacket.field851 == var1.serverPacket0) { var21 = var3.readStringCp1252NullTerminated(); - Object[] var46 = new Object[var21.length() + 1]; + Object[] var47 = new Object[var21.length() + 1]; for (var5 = var21.length() - 1; var5 >= 0; --var5) { if (var21.charAt(var5) == 's') { - var46[var5 + 1] = var3.readStringCp1252NullTerminated(); + var47[var5 + 1] = var3.readStringCp1252NullTerminated(); } else { - var46[var5 + 1] = new Integer(var3.readInt()); + var47[var5 + 1] = new Integer(var3.readInt()); } } - var46[0] = new Integer(var3.readInt()); - ScriptEvent var49 = new ScriptEvent(); - var49.args0 = var46; - AbstractIndexCache.runScript(var49); + var47[0] = new Integer(var3.readInt()); + ScriptEvent var50 = new ScriptEvent(); + var50.args0 = var47; + AbstractArchive.runScript(var50); var1.serverPacket0 = null; return true; } @@ -5099,29 +5114,29 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field867 == var1.serverPacket0) { - for (var37 = 0; var37 < VarpDefinition.field944; ++var37) { - VarpDefinition var44 = SecureRandomCallable.method1140(var37); - if (var44 != null) { - Varps.Varps_temp[var37] = 0; - Varps.Varps_main[var37] = 0; + for (var38 = 0; var38 < VarpDefinition.field944; ++var38) { + VarpDefinition var45 = SecureRandomCallable.method1140(var38); + if (var45 != null) { + Varps.Varps_temp[var38] = 0; + Varps.Varps_main[var38] = 0; } } - class12.method159(); + GrandExchangeOfferAgeComparator.method159(); field123 += 32; var1.serverPacket0 = null; return true; } if (ServerPacket.field833 == var1.serverPacket0) { - var37 = var3.readInt(); + var38 = var3.readInt(); var6 = var3.readUnsignedShort(); - if (var37 < -70000) { + if (var38 < -70000) { var6 += 32768; } - if (var37 >= 0) { - var8 = Huffman.getWidget(var37); + if (var38 >= 0) { + var8 = Huffman.getWidget(var38); } else { var8 = null; } @@ -5147,26 +5162,26 @@ public final class Client extends GameShell implements Usernamed { class22.method295(var8); } - class12.method159(); + GrandExchangeOfferAgeComparator.method159(); field116[++field117 - 1 & 31] = var6 & 32767; var1.serverPacket0 = null; return true; } if (ServerPacket.field854 == var1.serverPacket0) { - var37 = var3.readUnsignedShort(); + var38 = var3.readUnsignedShort(); var6 = var3.readUnsignedByte(); var5 = var3.readUnsignedShort(); - Ignored.queueSoundEffect(var37, var6, var5); + Ignored.queueSoundEffect(var38, var6, var5); var1.serverPacket0 = null; return true; } if (ServerPacket.field848 == var1.serverPacket0) { - var37 = var3.method72(); + var38 = var3.method72(); var6 = var3.method69(); var5 = var3.method68(); - var16 = Huffman.getWidget(var37); + var16 = Huffman.getWidget(var38); if (var5 != var16.rawX || var6 != var16.rawY || var16.xAlignment != 0 || var16.yAlignment != 0) { var16.rawX = var5; var16.rawY = var6; @@ -5175,7 +5190,7 @@ public final class Client extends GameShell implements Usernamed { class22.method295(var16); this.alignWidget(var16); if (var16.type == 0) { - class39.revalidateWidgetScroll(Widget.widgets[var37 >> 16], var16, false); + class39.revalidateWidgetScroll(Widget.interfaceComponents[var38 >> 16], var16, false); } } @@ -5184,12 +5199,12 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field824 == var1.serverPacket0) { - var37 = var3.method67(); + var38 = var3.method67(); var6 = var3.method73(); var8 = Huffman.getWidget(var6); - if (var8.modelType != 2 || var37 != var8.modelId) { + if (var8.modelType != 2 || var38 != var8.modelId) { var8.modelType = 2; - var8.modelId = var37; + var8.modelId = var38; class22.method295(var8); } @@ -5198,15 +5213,15 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field836 == var1.serverPacket0) { - World var43 = new World(); - var43.host = var3.readStringCp1252NullTerminated(); - var43.id = var3.readUnsignedShort(); + World var44 = new World(); + var44.host = var3.readStringCp1252NullTerminated(); + var44.id = var3.readUnsignedShort(); var6 = var3.readInt(); - var43.properties = var6; + var44.properties = var6; GameShell.updateGameState(45); var2.close(); var2 = null; - class31.changeWorld(var43); + class31.changeWorld(var44); var1.serverPacket0 = null; return false; } @@ -5225,19 +5240,19 @@ public final class Client extends GameShell implements Usernamed { return true; } - WidgetGroupParent var22; + InterfaceParent var22; if (ServerPacket.field871 == var1.serverPacket0) { - var37 = var3.readInt(); + var38 = var3.readInt(); var6 = var3.readInt(); - WidgetGroupParent var48 = (WidgetGroupParent)widgetGroupParents.get((long)var6); - var22 = (WidgetGroupParent)widgetGroupParents.get((long)var37); + InterfaceParent var49 = (InterfaceParent)interfaceParents.get((long)var6); + var22 = (InterfaceParent)interfaceParents.get((long)var38); if (var22 != null) { - MenuAction.closeWidgetGroup(var22, var48 == null || var48.group != var22.group); + MenuAction.closeInterface(var22, var49 == null || var49.group != var22.group); } - if (var48 != null) { - var48.remove(); - widgetGroupParents.put(var48, (long)var37); + if (var49 != null) { + var49.remove(); + interfaceParents.put(var49, (long)var38); } var15 = Huffman.getWidget(var6); @@ -5245,14 +5260,14 @@ public final class Client extends GameShell implements Usernamed { class22.method295(var15); } - var15 = Huffman.getWidget(var37); + var15 = Huffman.getWidget(var38); if (var15 != null) { class22.method295(var15); - class39.revalidateWidgetScroll(Widget.widgets[var15.id >>> 16], var15, true); + class39.revalidateWidgetScroll(Widget.interfaceComponents[var15.id >>> 16], var15, true); } - if (rootWidgetGroup != -1) { - GrandExchangeEvents.method74(rootWidgetGroup, 1); + if (rootInterface != -1) { + GrandExchangeEvents.method74(rootInterface, 1); } var1.serverPacket0 = null; @@ -5260,16 +5275,16 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field813 == var1.serverPacket0) { - var37 = var3.method72(); + var38 = var3.method72(); var6 = var3.method66(); var5 = var6 >> 10 & 31; var10 = var6 >> 5 & 31; var11 = var6 & 31; var12 = (var10 << 11) + (var5 << 19) + (var11 << 3); - Widget var47 = Huffman.getWidget(var37); - if (var12 != var47.color) { - var47.color = var12; - class22.method295(var47); + Widget var48 = Huffman.getWidget(var38); + if (var12 != var48.color) { + var48.color = var12; + class22.method295(var48); } var1.serverPacket0 = null; @@ -5277,15 +5292,15 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field828 == var1.serverPacket0) { - var37 = var3.readUnsignedByte(); + var38 = var3.readUnsignedByte(); var6 = var3.readUnsignedByte(); var5 = var3.readUnsignedByte(); var10 = var3.readUnsignedByte(); - field139[var37] = true; - field141[var37] = var6; - field142[var37] = var5; - field143[var37] = var10; - field144[var37] = 0; + field139[var38] = true; + field141[var38] = var6; + field142[var38] = var5; + field143[var38] = var10; + field144[var38] = 0; var1.serverPacket0 = null; return true; } @@ -5308,18 +5323,18 @@ public final class Client extends GameShell implements Usernamed { Canvas.field95 = var3.readUnsignedByteNegate(); WorldMapSection3.field1089 = var3.readUnsignedByte(); - for (var37 = WorldMapSection3.field1089; var37 < WorldMapSection3.field1089 + 8; ++var37) { + for (var38 = WorldMapSection3.field1089; var38 < WorldMapSection3.field1089 + 8; ++var38) { for (var6 = Canvas.field95; var6 < Canvas.field95 + 8; ++var6) { - if (groundItems[SoundSystem.plane][var37][var6] != null) { - groundItems[SoundSystem.plane][var37][var6] = null; - TilePaint.updateItemPile(var37, var6); + if (groundItems[SoundSystem.plane][var38][var6] != null) { + groundItems[SoundSystem.plane][var38][var6] = null; + TilePaint.updateItemPile(var38, var6); } } } - for (PendingSpawn var45 = (PendingSpawn) pendingSpawns.last(); var45 != null; var45 = (PendingSpawn) pendingSpawns.previous()) { - if (var45.x >= WorldMapSection3.field1089 && var45.x < WorldMapSection3.field1089 + 8 && var45.y >= Canvas.field95 && var45.y < Canvas.field95 + 8 && var45.level == SoundSystem.plane) { - var45.hitpoints = 0; + for (PendingSpawn var46 = (PendingSpawn)pendingSpawns.last(); var46 != null; var46 = (PendingSpawn)pendingSpawns.previous()) { + if (var46.x >= WorldMapSection3.field1089 && var46.x < WorldMapSection3.field1089 + 8 && var46.y >= Canvas.field95 && var46.y < Canvas.field95 + 8 && var46.plane == SoundSystem.plane) { + var46.hitpoints = 0; } } @@ -5328,9 +5343,9 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field820 == var1.serverPacket0) { - var37 = var3.method73(); + var38 = var3.method73(); var6 = var3.method67(); - var8 = Huffman.getWidget(var37); + var8 = Huffman.getWidget(var38); if (var8.modelType != 1 || var6 != var8.modelId) { var8.modelType = 1; var8.modelId = var6; @@ -5342,8 +5357,8 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field823 == var1.serverPacket0) { - var37 = var3.readUnsignedByte(); - BufferedNetSocket.method3500(var37); + var38 = var3.readUnsignedByte(); + BufferedNetSocket.method3500(var38); var1.serverPacket0 = null; return true; } @@ -5352,6 +5367,7 @@ public final class Client extends GameShell implements Usernamed { long var25; long var27; PlayerType var29; + int var51; if (ServerPacket.field843 == var1.serverPacket0) { var21 = var3.readStringCp1252NullTerminated(); var25 = var3.readLong(); @@ -5359,27 +5375,27 @@ public final class Client extends GameShell implements Usernamed { var19 = (long)var3.readMedium(); var29 = (PlayerType)ScriptFrame.findEnumerated(class48.method865(), var3.readUnsignedByte()); var23 = (var27 << 32) + var19; - boolean var53 = false; + boolean var55 = false; - for (int var31 = 0; var31 < 100; ++var31) { - if (field152[var31] == var23) { - var53 = true; + for (var51 = 0; var51 < 100; ++var51) { + if (field152[var51] == var23) { + var55 = true; break; } } if (var29.isUser && WorldMapArea.friendSystem.isIgnored(new Username(var21, KeyHandler.loginType))) { - var53 = true; + var55 = true; } - if (!var53 && field208 == 0) { + if (!var55 && field208 == 0) { field152[field156] = var23; field156 = (field156 + 1) % 100; - String var55 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(var3))); + String var56 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(var3))); if (var29.modIcon != -1) { - GrandExchangeEvents.addChatMessage(9, ItemContainer.method1170(var29.modIcon) + var21, var55, Clock.method3534(var25)); + GrandExchangeEvents.addChatMessage(9, ItemContainer.method1170(var29.modIcon) + var21, var56, Clock.method3534(var25)); } else { - GrandExchangeEvents.addChatMessage(9, var21, var55, Clock.method3534(var25)); + GrandExchangeEvents.addChatMessage(9, var21, var56, Clock.method3534(var25)); } } @@ -5394,9 +5410,9 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field808 == var1.serverPacket0) { - var37 = var3.readInt(); + var38 = var3.readInt(); var4 = var3.readStringCp1252NullTerminated(); - var8 = Huffman.getWidget(var37); + var8 = Huffman.getWidget(var38); if (!var4.equals(var8.text)) { var8.text = var4; class22.method295(var8); @@ -5415,8 +5431,8 @@ public final class Client extends GameShell implements Usernamed { if (ServerPacket.field791 == var1.serverPacket0) { isCameraLocked = false; - for (var37 = 0; var37 < 5; ++var37) { - field139[var37] = false; + for (var38 = 0; var38 < 5; ++var38) { + field139[var38] = false; } var1.serverPacket0 = null; @@ -5427,16 +5443,16 @@ public final class Client extends GameShell implements Usernamed { isCameraLocked = true; GrandExchangeOffer.field376 = var3.readUnsignedByte(); KeyHandler.field445 = var3.readUnsignedByte(); - IndexStoreAction.field410 = var3.readUnsignedShort(); + ArchiveDiskAction.field410 = var3.readUnsignedShort(); VertexNormal.field946 = var3.readUnsignedByte(); class171.field1116 = var3.readUnsignedByte(); if (class171.field1116 >= 100) { - var37 = GrandExchangeOffer.field376 * 128 + 64; + var38 = GrandExchangeOffer.field376 * 128 + 64; var6 = KeyHandler.field445 * 128 + 64; - var5 = class32.getTileHeight(var37, var6, SoundSystem.plane) - IndexStoreAction.field410; - var10 = var37 - WorldMapSection1.cameraX; + var5 = class32.getTileHeight(var38, var6, SoundSystem.plane) - ArchiveDiskAction.field410; + var10 = var38 - WorldMapSection1.cameraX; var11 = var5 - GrandExchangeEvents.cameraY; - var12 = var6 - class11.cameraZ; + var12 = var6 - GrandExchangeOfferNameComparator.cameraZ; var13 = (int)Math.sqrt((double)(var12 * var12 + var10 * var10)); WorldMapIcon1.cameraPitch = (int)(Math.atan2((double)var11, (double)var13) * 325.949D) & 2047; MusicPatchNode.cameraYaw = (int)(Math.atan2((double)var10, (double)var12) * -325.949D) & 2047; @@ -5454,9 +5470,9 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field865 == var1.serverPacket0) { - var37 = var3.method73(); + var38 = var3.method73(); var6 = var3.method67(); - var8 = Huffman.getWidget(var37); + var8 = Huffman.getWidget(var38); if (var8 != null && var8.type == 0) { if (var6 > var8.scrollHeight - var8.height) { var6 = var8.scrollHeight - var8.height; @@ -5477,9 +5493,9 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field835 == var1.serverPacket0) { - var37 = var3.method65(); - Script.method2216(var37); - field116[++field117 - 1 & 31] = var37 & 32767; + var38 = var3.method65(); + Script.method2216(var38); + field116[++field117 - 1 & 31] = var38 & 32767; var1.serverPacket0 = null; return true; } @@ -5495,16 +5511,16 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field811 == var1.serverPacket0) { - class12.method159(); - var37 = var3.method71(); + GrandExchangeOfferAgeComparator.method159(); + var38 = var3.method71(); var6 = var3.readUnsignedByteNegate(); var5 = var3.readUnsignedByte(); - experience[var6] = var37; + experience[var6] = var38; currentLevels[var6] = var5; levels[var6] = 1; for (var10 = 0; var10 < 98; ++var10) { - if (var37 >= Skills.Skills_experienceTable[var10]) { + if (var38 >= Skills.Skills_experienceTable[var10]) { levels[var6] = var10 + 2; } } @@ -5515,21 +5531,21 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field858 == var1.serverPacket0) { - var37 = var3.readInt(); + var38 = var3.readInt(); var6 = var3.readInt(); var5 = DynamicObject.method2222(); - PacketBufferNode var56 = Interpreter.method1915(ClientPacket.field233, packetWriter.isaacCipher); - var56.packetBuffer.method56(var5); - var56.packetBuffer.writeByte(GameShell.fps); - var56.packetBuffer.writeIntME(var37); - var56.packetBuffer.writeIntLE(var6); - packetWriter.method241(var56); + PacketBufferNode var54 = Interpreter.method1915(ClientPacket.field233, packetWriter.isaacCipher); + var54.packetBuffer.method56(var5); + var54.packetBuffer.writeByte(GameShell.fps); + var54.packetBuffer.writeIntME(var38); + var54.packetBuffer.writeIntLE(var6); + packetWriter.method241(var54); var1.serverPacket0 = null; return true; } if (ServerPacket.field860 == var1.serverPacket0) { - class12.method159(); + GrandExchangeOfferAgeComparator.method159(); weight = var3.method44(); field124 = cycleCntr; var1.serverPacket0 = null; @@ -5558,11 +5574,11 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field807 == var1.serverPacket0) { - byte[] var54 = new byte[var1.serverPacket0Length]; - var3.method237(var54, 0, var54.length); - Buffer var52 = new Buffer(var54); - var17 = var52.readStringCp1252NullTerminated(); - WorldMapCacheName.method635(var17, true, false); + byte[] var52 = new byte[var1.serverPacket0Length]; + var3.method237(var52, 0, var52.length); + Buffer var53 = new Buffer(var52); + var17 = var53.readStringCp1252NullTerminated(); + WorldMapCacheName.openURL(var17, true, false); var1.serverPacket0 = null; return true; } @@ -5573,54 +5589,54 @@ public final class Client extends GameShell implements Usernamed { return true; } - WidgetGroupParent var50; + InterfaceParent var30; if (ServerPacket.field845 == var1.serverPacket0) { - var37 = var3.index + var1.serverPacket0Length; + var38 = var3.index + var1.serverPacket0Length; var6 = var3.readUnsignedShort(); var5 = var3.readUnsignedShort(); - if (var6 != rootWidgetGroup) { - rootWidgetGroup = var6; + if (var6 != rootInterface) { + rootInterface = var6; this.method87(false); - DevicePcmPlayerProvider.method845(rootWidgetGroup); - WorldMapSection3.runWidgetOnLoadListener(rootWidgetGroup); + DevicePcmPlayerProvider.method845(rootInterface); + WorldMapSection3.runWidgetOnLoadListener(rootInterface); for (var10 = 0; var10 < 100; ++var10) { field100[var10] = true; } } - for (; var5-- > 0; var50.keep = true) { + for (; var5-- > 0; var30.keep = true) { var10 = var3.readInt(); var11 = var3.readUnsignedShort(); var12 = var3.readUnsignedByte(); - var50 = (WidgetGroupParent)widgetGroupParents.get((long)var10); - if (var50 != null && var11 != var50.group) { - MenuAction.closeWidgetGroup(var50, true); - var50 = null; + var30 = (InterfaceParent)interfaceParents.get((long)var10); + if (var30 != null && var11 != var30.group) { + MenuAction.closeInterface(var30, true); + var30 = null; } - if (var50 == null) { - var50 = SecureRandomCallable.method1143(var10, var11, var12); + if (var30 == null) { + var30 = SecureRandomCallable.method1143(var10, var11, var12); } } - for (var22 = (WidgetGroupParent)widgetGroupParents.first(); var22 != null; var22 = (WidgetGroupParent)widgetGroupParents.next()) { + for (var22 = (InterfaceParent)interfaceParents.first(); var22 != null; var22 = (InterfaceParent)interfaceParents.next()) { if (var22.keep) { var22.keep = false; } else { - MenuAction.closeWidgetGroup(var22, true); + MenuAction.closeInterface(var22, true); } } widgetClickMasks = new NodeHashTable(512); - while (var3.index < var37) { + while (var3.index < var38) { var10 = var3.readInt(); var11 = var3.readUnsignedShort(); var12 = var3.readUnsignedShort(); var13 = var3.readInt(); - for (int var51 = var11; var51 <= var12; ++var51) { + for (var51 = var11; var51 <= var12; ++var51) { var23 = (long)var51 + ((long)var10 << 32); widgetClickMasks.put(new IntegerNode(var13), var23); } @@ -5631,7 +5647,7 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field855 == var1.serverPacket0) { - var37 = var3.method58(); + var38 = var3.method58(); var6 = var3.method58(); var17 = var3.readStringCp1252NullTerminated(); if (var6 >= 1 && var6 <= 8) { @@ -5640,7 +5656,7 @@ public final class Client extends GameShell implements Usernamed { } playerMenuActions[var6 - 1] = var17; - playerOptionsPriorities[var6 - 1] = var37 == 0; + playerOptionsPriorities[var6 - 1] = var38 == 0; } var1.serverPacket0 = null; @@ -5670,15 +5686,15 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field793 == var1.serverPacket0) { - var37 = var3.readUnsignedShort(); + var38 = var3.readUnsignedShort(); var6 = var3.readInt(); - Varps.Varps_temp[var37] = var6; - if (Varps.Varps_main[var37] != var6) { - Varps.Varps_main[var37] = var6; + Varps.Varps_temp[var38] = var6; + if (Varps.Varps_main[var38] != var6) { + Varps.Varps_main[var38] = var6; } - IndexCache.method4703(var37); - field121[++field123 - 1 & 31] = var37; + Archive.method4703(var38); + field121[++field123 - 1 & 31] = var38; var1.serverPacket0 = null; return true; } @@ -5690,10 +5706,10 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field798 == var1.serverPacket0) { - var37 = var3.readInt(); - var50 = (WidgetGroupParent)widgetGroupParents.get((long)var37); - if (var50 != null) { - MenuAction.closeWidgetGroup(var50, true); + var38 = var3.readInt(); + var30 = (InterfaceParent)interfaceParents.get((long)var38); + if (var30 != null) { + MenuAction.closeInterface(var30, true); } if (field127 != null) { @@ -5706,11 +5722,11 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field862 == var1.serverPacket0) { - for (var37 = 0; var37 < Varps.Varps_main.length; ++var37) { - if (Varps.Varps_temp[var37] != Varps.Varps_main[var37]) { - Varps.Varps_main[var37] = Varps.Varps_temp[var37]; - IndexCache.method4703(var37); - field121[++field123 - 1 & 31] = var37; + for (var38 = 0; var38 < Varps.Varps_main.length; ++var38) { + if (Varps.Varps_temp[var38] != Varps.Varps_main[var38]) { + Varps.Varps_main[var38] = Varps.Varps_temp[var38]; + Archive.method4703(var38); + field121[++field123 - 1 & 31] = var38; } } @@ -5726,38 +5742,38 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field812 == var1.serverPacket0) { - var37 = var3.method67(); - if (var37 == 65535) { - var37 = -1; + var38 = var3.method67(); + if (var38 == 65535) { + var38 = -1; } - AbstractUserComparator.method5437(var37); + AbstractUserComparator.method5437(var38); var1.serverPacket0 = null; return true; } if (ServerPacket.field829 == var1.serverPacket0) { - var37 = var3.method70(); + var38 = var3.method70(); var6 = var3.method66(); if (var6 == 65535) { var6 = -1; } - HealthBar.method1994(var6, var37); + HealthBar.method1994(var6, var38); var1.serverPacket0 = null; return true; } if (ServerPacket.field866 == var1.serverPacket0) { - var37 = var3.method58(); + var38 = var3.method58(); var6 = var3.method72(); var5 = var3.method67(); - var22 = (WidgetGroupParent)widgetGroupParents.get((long)var6); + var22 = (InterfaceParent)interfaceParents.get((long)var6); if (var22 != null) { - MenuAction.closeWidgetGroup(var22, var5 != var22.group); + MenuAction.closeInterface(var22, var5 != var22.group); } - SecureRandomCallable.method1143(var6, var5, var37); + SecureRandomCallable.method1143(var6, var5, var38); var1.serverPacket0 = null; return true; } @@ -5767,35 +5783,35 @@ public final class Client extends GameShell implements Usernamed { var25 = (long)var3.readUnsignedShort(); var27 = (long)var3.readMedium(); var29 = (PlayerType)ScriptFrame.findEnumerated(class48.method865(), var3.readUnsignedByte()); - long var30 = (var25 << 32) + var27; - boolean var32 = false; + long var31 = (var25 << 32) + var27; + boolean var33 = false; - for (int var33 = 0; var33 < 100; ++var33) { - if (var30 == field152[var33]) { - var32 = true; + for (int var34 = 0; var34 < 100; ++var34) { + if (var31 == field152[var34]) { + var33 = true; break; } } if (WorldMapArea.friendSystem.isIgnored(new Username(var21, KeyHandler.loginType))) { - var32 = true; + var33 = true; } - if (!var32 && field208 == 0) { - field152[field156] = var30; + if (!var33 && field208 == 0) { + field152[field156] = var31; field156 = (field156 + 1) % 100; String var57 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(var3))); - byte var34; + byte var35; if (var29.isPrivileged) { - var34 = 7; + var35 = 7; } else { - var34 = 3; + var35 = 3; } if (var29.modIcon != -1) { - WorldMapIcon1.method219(var34, ItemContainer.method1170(var29.modIcon) + var21, var57); + WorldMapIcon1.addGameMessage(var35, ItemContainer.method1170(var29.modIcon) + var21, var57); } else { - WorldMapIcon1.method219(var34, var21, var57); + WorldMapIcon1.addGameMessage(var35, var21, var57); } } @@ -5804,9 +5820,9 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field794 == var1.serverPacket0) { - var37 = var3.readInt(); - if (var37 != field198) { - field198 = var37; + var38 = var3.readInt(); + if (var38 != field198) { + field198 = var38; WorldMapArea.method428(); } @@ -5823,23 +5839,23 @@ public final class Client extends GameShell implements Usernamed { if (ServerPacket.field827 == var1.serverPacket0) { var21 = var3.readStringCp1252NullTerminated(); var4 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(var3))); - WorldMapIcon1.method219(6, var21, var4); + WorldMapIcon1.addGameMessage(6, var21, var4); var1.serverPacket0 = null; return true; } NPCDefinition.sendStackTrace("" + (var1.serverPacket0 != null ? var1.serverPacket0.id : -1) + "," + (var1.field677 != null ? var1.field677.id : -1) + "," + (var1.field678 != null ? var1.field678.id : -1) + "," + var1.serverPacket0Length, (Throwable)null); TextureProvider.method2773(); - } catch (IOException var35) { + } catch (IOException var36) { class48.method868(); - } catch (Exception var36) { + } catch (Exception var37) { var4 = "" + (var1.serverPacket0 != null ? var1.serverPacket0.id : -1) + "," + (var1.field677 != null ? var1.field677.id : -1) + "," + (var1.field678 != null ? var1.field678.id : -1) + "," + var1.serverPacket0Length + "," + (Canvas.localPlayer.pathX[0] + class50.baseX) + "," + (Canvas.localPlayer.pathY[0] + GraphicsObject.baseY) + ","; for (var5 = 0; var5 < var1.serverPacket0Length && var5 < 50; ++var5) { var4 = var4 + var3.array[var5] + ","; } - NPCDefinition.sendStackTrace(var4, var36); + NPCDefinition.sendStackTrace(var4, var37); TextureProvider.method2773(); } @@ -5889,13 +5905,13 @@ public final class Client extends GameShell implements Usernamed { } if (DevicePcmPlayerProvider.dragInventoryWidget == null && clickedWidget == null) { - int var12 = MouseHandler.MouseHandler_lastButton; + int var11 = MouseHandler.MouseHandler_lastButton; int var7; - int var11; + int var12; int var13; if (isMenuOpen) { int var14; - if (var12 != 1 && (AbstractRasterProvider.mouseCam || var12 != 4)) { + if (var11 != 1 && (AbstractRasterProvider.mouseCam || var11 != 4)) { var2 = MouseHandler.MouseHandler_x; var14 = MouseHandler.MouseHandler_y; if (var2 < WorldMapDecoration.menuX - 10 || var2 > WorldMapDecoration.menuX + class214.menuWidth + 10 || var14 < GameShell.menuY - 10 || var14 > AbstractWorldMapIcon.menuHeight + GameShell.menuY + 10) { @@ -5904,17 +5920,17 @@ public final class Client extends GameShell implements Usernamed { } } - if (var12 == 1 || !AbstractRasterProvider.mouseCam && var12 == 4) { + if (var11 == 1 || !AbstractRasterProvider.mouseCam && var11 == 4) { var2 = WorldMapDecoration.menuX; var14 = GameShell.menuY; - var7 = class214.menuWidth; + var12 = class214.menuWidth; var3 = MouseHandler.MouseHandler_lastPressedX; - var11 = MouseHandler.MouseHandler_lastPressedY; + var13 = MouseHandler.MouseHandler_lastPressedY; int var15 = -1; for (int var16 = 0; var16 < menuOptionsCount; ++var16) { - var13 = (menuOptionsCount - 1 - var16) * 15 + var14 + 31; - if (var3 > var2 && var3 < var7 + var2 && var11 > var13 - 13 && var11 < var13 + 3) { + var7 = (menuOptionsCount - 1 - var16) * 15 + var14 + 31; + if (var3 > var2 && var3 < var12 + var2 && var13 > var7 - 13 && var13 < var7 + 3) { var15 = var16; } } @@ -5927,69 +5943,73 @@ public final class Client extends GameShell implements Usernamed { Players.method2112(WorldMapDecoration.menuX, GameShell.menuY, class214.menuWidth, AbstractWorldMapIcon.menuHeight); } } else { - var2 = menuOptionsCount - 1; - if ((var12 == 1 || !AbstractRasterProvider.mouseCam && var12 == 4) && var2 >= 0) { - var7 = menuOpcodes[var2]; - if (var7 == 39 || var7 == 40 || var7 == 41 || var7 == 42 || var7 == 43 || var7 == 33 || var7 == 34 || var7 == 35 || var7 == 36 || var7 == 37 || var7 == 38 || var7 == 1005) { - label223: { + label219: { + var2 = menuOptionsCount - 1; + if ((var11 == 1 || !AbstractRasterProvider.mouseCam && var11 == 4) && var2 >= 0) { + var12 = menuOpcodes[var2]; + if (var12 == 39 || var12 == 40 || var12 == 41 || var12 == 42 || var12 == 43 || var12 == 33 || var12 == 34 || var12 == 35 || var12 == 36 || var12 == 37 || var12 == 38 || var12 == 1005) { var3 = menuArguments1[var2]; - var11 = menuArguments2[var2]; - Widget var8 = Huffman.getWidget(var11); - var13 = class1.getWidgetClickMask(var8); - boolean var9 = (var13 >> 28 & 1) != 0; - if (!var9) { - Object var10 = null; - if (!class168.method3461(class1.getWidgetClickMask(var8))) { - break label223; - } + var13 = menuArguments2[var2]; + Widget var8 = Huffman.getWidget(var13); + var7 = class1.getWidgetClickMask(var8); + boolean var9 = (var7 >> 28 & 1) != 0; + if (var9) { + break label219; } - if (DevicePcmPlayerProvider.dragInventoryWidget != null && !field207 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { - var12 = field205; - var13 = field206; - WorldMapDecorationType.processTempMenuAction(UnitPriceComparator.tempMenuAction, var12, var13); - UnitPriceComparator.tempMenuAction = null; + Object var10 = null; + if (class168.method3461(class1.getWidgetClickMask(var8))) { + break label219; } - - field207 = false; - itemDragDuration = 0; - if (DevicePcmPlayerProvider.dragInventoryWidget != null) { - class22.method295(DevicePcmPlayerProvider.dragInventoryWidget); - } - - DevicePcmPlayerProvider.dragInventoryWidget = Huffman.getWidget(var11); - dragItemSlotSource = var3; - field205 = MouseHandler.MouseHandler_lastPressedX; - field206 = MouseHandler.MouseHandler_lastPressedY; - if (var2 >= 0) { - UnitPriceComparator.tempMenuAction = new MenuAction(); - UnitPriceComparator.tempMenuAction.argument1 = menuArguments1[var2]; - UnitPriceComparator.tempMenuAction.argument2 = menuArguments2[var2]; - UnitPriceComparator.tempMenuAction.opcode = menuOpcodes[var2]; - UnitPriceComparator.tempMenuAction.argument0 = menuArguments0[var2]; - UnitPriceComparator.tempMenuAction.action = menuActions[var2]; - } - - class22.method295(DevicePcmPlayerProvider.dragInventoryWidget); - return; } } + + if ((var11 == 1 || !AbstractRasterProvider.mouseCam && var11 == 4) && this.shouldLeftClickOpenMenu()) { + var11 = 2; + } + + if ((var11 == 1 || !AbstractRasterProvider.mouseCam && var11 == 4) && menuOptionsCount > 0) { + WorldMapSection0.method245(var2); + } + + if (var11 == 2 && menuOptionsCount > 0) { + this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); + } + + return; } - if ((var12 == 1 || !AbstractRasterProvider.mouseCam && var12 == 4) && this.shouldLeftClickOpenMenu()) { - var12 = 2; + if (DevicePcmPlayerProvider.dragInventoryWidget != null && !field207 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { + var11 = field205; + var7 = field206; + WorldMapDecorationType.processTempMenuAction(GrandExchangeOfferUnitPriceComparator.tempMenuAction, var11, var7); + GrandExchangeOfferUnitPriceComparator.tempMenuAction = null; } - if ((var12 == 1 || !AbstractRasterProvider.mouseCam && var12 == 4) && menuOptionsCount > 0) { - WorldMapSection0.method245(var2); + field207 = false; + itemDragDuration = 0; + if (DevicePcmPlayerProvider.dragInventoryWidget != null) { + class22.method295(DevicePcmPlayerProvider.dragInventoryWidget); } - if (var12 == 2 && menuOptionsCount > 0) { - this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); + DevicePcmPlayerProvider.dragInventoryWidget = Huffman.getWidget(var13); + dragItemSlotSource = var3; + field205 = MouseHandler.MouseHandler_lastPressedX; + field206 = MouseHandler.MouseHandler_lastPressedY; + if (var2 >= 0) { + GrandExchangeOfferUnitPriceComparator.tempMenuAction = new MenuAction(); + GrandExchangeOfferUnitPriceComparator.tempMenuAction.argument1 = menuArguments1[var2]; + GrandExchangeOfferUnitPriceComparator.tempMenuAction.argument2 = menuArguments2[var2]; + GrandExchangeOfferUnitPriceComparator.tempMenuAction.opcode = menuOpcodes[var2]; + GrandExchangeOfferUnitPriceComparator.tempMenuAction.argument0 = menuArguments0[var2]; + GrandExchangeOfferUnitPriceComparator.tempMenuAction.action = menuActions[var2]; } + + class22.method295(DevicePcmPlayerProvider.dragInventoryWidget); + return; } - } + } @ObfuscatedName("ht") @@ -6009,7 +6029,7 @@ public final class Client extends GameShell implements Usernamed { garbageValue = "1" ) @Export("openMenu") - final void openMenu(int var1, int var2) { + final void openMenu(int x, int y) { int var3 = class2.fontBold12.stringWidth("Choose Option"); int var4; @@ -6032,7 +6052,7 @@ public final class Client extends GameShell implements Usernamed { var3 += 8; var4 = menuOptionsCount * 15 + 22; - int var8 = var1 - var3 / 2; + int var8 = x - var3 / 2; if (var3 + var8 > SoundCache.canvasWidth) { var8 = SoundCache.canvasWidth - var3; } @@ -6041,8 +6061,8 @@ public final class Client extends GameShell implements Usernamed { var8 = 0; } - int var9 = var2; - if (var4 + var2 > Huffman.canvasHeight) { + int var9 = y; + if (var4 + y > Huffman.canvasHeight) { var9 = Huffman.canvasHeight - var4; } @@ -6054,7 +6074,7 @@ public final class Client extends GameShell implements Usernamed { GameShell.menuY = var9; class214.menuWidth = var3; AbstractWorldMapIcon.menuHeight = menuOptionsCount * 15 + 22; - class65.scene.menuOpen(SoundSystem.plane, var1, var2, false); + class65.scene.menuOpen(SoundSystem.plane, x, y, false); isMenuOpen = true; } @@ -6064,11 +6084,11 @@ public final class Client extends GameShell implements Usernamed { garbageValue = "-271438207" ) final void method87(boolean var1) { - int var2 = rootWidgetGroup; + int var2 = rootInterface; int var3 = SoundCache.canvasWidth; int var4 = Huffman.canvasHeight; - if (GroundItemPile.loadWidgetGroup(var2)) { - WorldMapRegion.notRevalidateWidgetScroll(Widget.widgets[var2], -1, var3, var4, var1); + if (GroundItemPile.loadInterface(var2)) { + WorldMapRegion.notRevalidateWidgetScroll(Widget.interfaceComponents[var2], -1, var3, var4, var1); } } @@ -6079,8 +6099,8 @@ public final class Client extends GameShell implements Usernamed { garbageValue = "0" ) @Export("alignWidget") - void alignWidget(Widget var1) { - Widget var2 = var1.parentId == -1 ? null : Huffman.getWidget(var1.parentId); + void alignWidget(Widget component) { + Widget var2 = component.parentId == -1 ? null : Huffman.getWidget(component.parentId); int var3; int var4; if (var2 == null) { @@ -6091,8 +6111,8 @@ public final class Client extends GameShell implements Usernamed { var4 = var2.height; } - WorldMapSection3.alignWidgetSize(var1, var3, var4, false); - OverlayDefinition.alignWidgetPosition(var1, var3, var4); + WorldMapSection3.alignWidgetSize(component, var3, var4, false); + FloorOverlayDefinition.alignWidgetPosition(component, var3, var4); } @ObfuscatedName("jh") @@ -6140,11 +6160,11 @@ public final class Client extends GameShell implements Usernamed { var8.mouseX = var6; var8.mouseY = var7; var8.args0 = clickedWidget.onDrag; - AbstractIndexCache.runScript(var8); + AbstractArchive.runScript(var8); } if (MouseHandler.MouseHandler_currentButton == 0) { - int var10; + int var9; if (isDraggingWidget) { if (clickedWidget.onDragComplete != null) { var8 = new ScriptEvent(); @@ -6153,26 +6173,31 @@ public final class Client extends GameShell implements Usernamed { var8.mouseY = var7; var8.dragTarget = draggedOnWidget; var8.args0 = clickedWidget.onDragComplete; - AbstractIndexCache.runScript(var8); + AbstractArchive.runScript(var8); } if (draggedOnWidget != null) { Widget var13 = clickedWidget; - var10 = WorldMapRegion.method568(class1.getWidgetClickMask(var13)); + var9 = WorldMapRegion.method568(class1.getWidgetClickMask(var13)); Widget var11; - if (var10 == 0) { + if (var9 == 0) { var11 = null; } else { - label100: { - for (int var12 = 0; var12 < var10; ++var12) { - var13 = Huffman.getWidget(var13.parentId); - if (var13 == null) { - var11 = null; - break label100; - } + int var12 = 0; + + while (true) { + if (var12 >= var9) { + var11 = var13; + break; } - var11 = var13; + var13 = Huffman.getWidget(var13.parentId); + if (var13 == null) { + var11 = null; + break; + } + + ++var12; } } @@ -6190,10 +6215,10 @@ public final class Client extends GameShell implements Usernamed { } else if (this.shouldLeftClickOpenMenu()) { this.openMenu(field110 + widgetClickX, field111 + widgetClickY); } else if (menuOptionsCount > 0) { - int var9 = widgetClickX + field110; - var10 = widgetClickY + field111; - WorldMapDecorationType.processTempMenuAction(UnitPriceComparator.tempMenuAction, var9, var10); - UnitPriceComparator.tempMenuAction = null; + int var10 = widgetClickX + field110; + var9 = widgetClickY + field111; + WorldMapDecorationType.processTempMenuAction(GrandExchangeOfferUnitPriceComparator.tempMenuAction, var10, var9); + GrandExchangeOfferUnitPriceComparator.tempMenuAction = null; } clickedWidget = null; @@ -6220,12 +6245,12 @@ public final class Client extends GameShell implements Usernamed { garbageValue = "-1464358697" ) @Export("hashString") - public static int hashString(CharSequence var0) { - int var1 = var0.length(); + public static int hashString(CharSequence chars) { + int var1 = chars.length(); int var2 = 0; for (int var3 = 0; var3 < var1; ++var3) { - var2 = (var2 << 5) - var2 + HealthBar.charToByteCp1252(var0.charAt(var3)); + var2 = (var2 << 5) - var2 + HealthBar.charToByteCp1252(chars.charAt(var3)); } return var2; @@ -6249,7 +6274,7 @@ public final class Client extends GameShell implements Usernamed { isLowDetail = false; language = 0; clientType = -1; - field162 = false; + onMobile = false; gameState = 0; isLoading = true; cycle = 0; @@ -6309,19 +6334,19 @@ public final class Client extends GameShell implements Usernamed { field187 = 7759444; field188 = false; field189 = 0; - cameraPitchTarget = 128; - minimapOrientation = 0; + camAngleX = 128; + camAngleY = 0; field190 = 0; field191 = 0; field192 = 0; field193 = 0; oculusOrbState = 0; - cameraFollowHeight = 50; + camFollowHeight = 50; field194 = 0; field195 = 0; field196 = 0; oculusOrbNormalSpeed = 12; - field197 = 6; + oculusOrbSlowedSpeed = 6; field198 = 0; field199 = false; field200 = 0; @@ -6400,8 +6425,8 @@ public final class Client extends GameShell implements Usernamed { field157 = -1; selectedSpellActionName = null; selectedSpellName = null; - rootWidgetGroup = -1; - widgetGroupParents = new NodeHashTable(8); + rootInterface = -1; + interfaceParents = new NodeHashTable(8); field151 = 0; field153 = -1; chatEffects = 0; @@ -6409,9 +6434,9 @@ public final class Client extends GameShell implements Usernamed { field127 = null; runEnergy = 0; weight = 0; - rights = 0; + staffModLevel = 0; followerIndex = -1; - field155 = false; + playerMod = false; viewportWidget = null; clickedWidget = null; clickedWidgetParent = null; @@ -6508,10 +6533,10 @@ public final class Client extends GameShell implements Usernamed { field120 = -1; platformInfoProvider = new DesktopPlatformInfoProvider(); grandExchangeOffers = new GrandExchangeOffer[8]; - field159 = new OwnWorldComparator(); + geOwnWorldComparator = new GrandExchangeOfferOwnWorldComparator(); field104 = -1; - indexCacheLoaders = new ArrayList(10); - indexCacheLoaderIndex = 0; + archiveLoaders = new ArrayList(10); + archiveLoaderArchive = 0; field140 = 0; field895 = new class65(); field113 = new int[50]; diff --git a/runescape-client/src/main/java/ClientPreferences.java b/runescape-client/src/main/java/ClientPreferences.java index 6383e1ba8e..3abd42b636 100644 --- a/runescape-client/src/main/java/ClientPreferences.java +++ b/runescape-client/src/main/java/ClientPreferences.java @@ -149,8 +149,8 @@ public class ClientPreferences { garbageValue = "0" ) static final void method1809(int var0) { - if (GroundItemPile.loadWidgetGroup(var0)) { - NetFileRequest.method4555(Widget.widgets[var0], -1); + if (GroundItemPile.loadInterface(var0)) { + NetFileRequest.method4555(Widget.interfaceComponents[var0], -1); } } diff --git a/runescape-client/src/main/java/Clock.java b/runescape-client/src/main/java/Clock.java index 5b4f4b05b2..58fa98ed08 100644 --- a/runescape-client/src/main/java/Clock.java +++ b/runescape-client/src/main/java/Clock.java @@ -27,7 +27,7 @@ public abstract class Clock { garbageValue = "-126803683" ) @Export("wait") - public abstract int wait(int var1, int var2); + public abstract int wait(int cycleMs, int minSleepMs); @ObfuscatedName("m") public static String method3534(long var0) { @@ -41,22 +41,22 @@ public abstract class Clock { ++var2; } - char var4; - StringBuilder var8; - for (var8 = new StringBuilder(var2); var0 != 0L; var8.append(var4)) { + StringBuilder var4; + char var8; + for (var4 = new StringBuilder(var2); var0 != 0L; var4.append(var8)) { long var5 = var0; var0 /= 37L; - var4 = class306.base37Table[(int)(var5 - 37L * var0)]; - if (var4 == '_') { - int var7 = var8.length() - 1; - var8.setCharAt(var7, Character.toUpperCase(var8.charAt(var7))); - var4 = 160; + var8 = class306.base37Table[(int)(var5 - 37L * var0)]; + if (var8 == '_') { + int var7 = var4.length() - 1; + var4.setCharAt(var7, Character.toUpperCase(var4.charAt(var7))); + var8 = 160; } } - var8.reverse(); - var8.setCharAt(0, Character.toUpperCase(var8.charAt(0))); - return var8.toString(); + var4.reverse(); + var4.setCharAt(0, Character.toUpperCase(var4.charAt(0))); + return var4.toString(); } } else { return null; diff --git a/runescape-client/src/main/java/CollisionMap.java b/runescape-client/src/main/java/CollisionMap.java index 1e1ac5e132..07d8425e12 100644 --- a/runescape-client/src/main/java/CollisionMap.java +++ b/runescape-client/src/main/java/CollisionMap.java @@ -249,8 +249,8 @@ public class CollisionMap { public void method92(int var1, int var2) { var1 -= this.xInset; var2 -= this.yInset; - int[] var10000 = this.flags[var1]; - var10000[var2] |= 2097152; + int[] var3 = this.flags[var1]; + var3[var2] |= 2097152; } @ObfuscatedName("o") @@ -261,8 +261,8 @@ public class CollisionMap { public void method93(int var1, int var2) { var1 -= this.xInset; var2 -= this.yInset; - int[] var10000 = this.flags[var1]; - var10000[var2] |= 262144; + int[] var3 = this.flags[var1]; + var3[var2] |= 262144; } @ObfuscatedName("u") @@ -271,8 +271,8 @@ public class CollisionMap { garbageValue = "953350100" ) void method94(int var1, int var2, int var3) { - int[] var10000 = this.flags[var1]; - var10000[var2] |= var3; + int[] var4 = this.flags[var1]; + var4[var2] |= var3; } @ObfuscatedName("g") @@ -465,8 +465,8 @@ public class CollisionMap { garbageValue = "52290294" ) void method97(int var1, int var2, int var3) { - int[] var10000 = this.flags[var1]; - var10000[var2] &= ~var3; + int[] var4 = this.flags[var1]; + var4[var2] &= ~var3; } @ObfuscatedName("x") @@ -477,8 +477,8 @@ public class CollisionMap { public void method98(int var1, int var2) { var1 -= this.xInset; var2 -= this.yInset; - int[] var10000 = this.flags[var1]; - var10000[var2] &= -262145; + int[] var3 = this.flags[var1]; + var3[var2] &= -262145; } @ObfuscatedName("m") diff --git a/runescape-client/src/main/java/TileLocation.java b/runescape-client/src/main/java/Coord.java similarity index 63% rename from runescape-client/src/main/java/TileLocation.java rename to runescape-client/src/main/java/Coord.java index 20e031a17f..b50902a475 100644 --- a/runescape-client/src/main/java/TileLocation.java +++ b/runescape-client/src/main/java/Coord.java @@ -5,8 +5,8 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("hu") -@Implements("TileLocation") -public class TileLocation { +@Implements("Coord") +public class Coord { @ObfuscatedName("m") @ObfuscatedGetter( intValue = 503621925 @@ -29,19 +29,19 @@ public class TileLocation { @ObfuscatedSignature( signature = "(Lhu;)V" ) - public TileLocation(TileLocation var1) { + public Coord(Coord var1) { this.plane = var1.plane; this.x = var1.x; this.y = var1.y; } - public TileLocation(int var1, int var2, int var3) { + public Coord(int var1, int var2, int var3) { this.plane = var1; this.x = var2; this.y = var3; } - public TileLocation(int var1) { + public Coord(int var1) { if (var1 == -1) { this.plane = -1; } else { @@ -67,9 +67,9 @@ public class TileLocation { signature = "(Lhu;B)Z", garbageValue = "-1" ) - @Export("equals0") - boolean equals0(TileLocation var1) { - return this.plane != var1.plane ? false : (this.x != var1.x ? false : this.y == var1.y); + @Export("equalsCoord") + boolean equalsCoord(Coord other) { + return this.plane != other.plane ? false : (this.x != other.x ? false : this.y == other.y); } @ObfuscatedName("q") @@ -77,23 +77,20 @@ public class TileLocation { signature = "(Ljava/lang/String;I)Ljava/lang/String;", garbageValue = "997364398" ) - @Export("toString0") - String toString0(String var1) { - return this.plane + var1 + (this.x >> 6) + var1 + (this.y >> 6) + var1 + (this.x & 63) + var1 + (this.y & 63); + @Export("toString") + String toString(String separator) { + return this.plane + separator + (this.x >> 6) + separator + (this.y >> 6) + separator + (this.x & 63) + separator + (this.y & 63); } - @ObfuscatedName("equals") - public boolean method326(Object var1) { - return this == var1 ? true : (!(var1 instanceof TileLocation) ? false : this.equals0((TileLocation)var1)); + public boolean equals(Object var1) { + return this == var1 ? true : (!(var1 instanceof Coord) ? false : this.equalsCoord((Coord)var1)); } - @ObfuscatedName("hashCode") - public int method327() { + public int hashCode() { return this.packed(); } - @ObfuscatedName("toString") - public String method328() { - return this.toString0(","); + public String toString() { + return this.toString(","); } } diff --git a/runescape-client/src/main/java/Decimator.java b/runescape-client/src/main/java/Decimator.java index c063c4d198..4e4e0739db 100644 --- a/runescape-client/src/main/java/Decimator.java +++ b/runescape-client/src/main/java/Decimator.java @@ -3,6 +3,7 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("dp") @Implements("Decimator") @@ -125,12 +126,12 @@ public class Decimator { garbageValue = "-1419232405" ) @Export("scaleRate") - int scaleRate(int var1) { + int scaleRate(int rate) { if (this.table != null) { - var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate); + rate = (int)((long)this.outputRate * (long)rate / (long)this.inputRate); } - return var1; + return rate; } @ObfuscatedName("q") @@ -139,12 +140,12 @@ public class Decimator { garbageValue = "25" ) @Export("scalePosition") - int scalePosition(int var1) { + int scalePosition(int position) { if (this.table != null) { - var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate) + 6; + position = (int)((long)this.outputRate * (long)position / (long)this.inputRate) + 6; } - return var1; + return position; } @ObfuscatedName("f") @@ -158,7 +159,7 @@ public class Decimator { if (KeyHandler.field453 == KeyHandler.field455) { return false; } else { - IndexStoreAction.field411 = KeyHandler.field450[KeyHandler.field453]; + ArchiveDiskAction.field411 = KeyHandler.field450[KeyHandler.field453]; GzipDecompressor.field378 = KeyHandler.field449[KeyHandler.field453]; KeyHandler.field453 = KeyHandler.field453 + 1 & 127; return true; @@ -211,10 +212,10 @@ public class Decimator { ViewportMouse.field951 = (var16 + var10) / 2; ViewportMouse.field952 = (var13 + var12) / 2; ViewportMouse.field953 = (var17 - var9) / 2; - class311.field1156 = (var16 - var10) / 2; + DefaultsGroup.field1156 = (var16 - var10) / 2; Skeleton.field874 = (var13 - var12) / 2; GraphicsObject.field377 = Math.abs(ViewportMouse.field953); - ViewportMouse.field954 = Math.abs(class311.field1156); + ViewportMouse.field954 = Math.abs(DefaultsGroup.field1156); class248.field1142 = Math.abs(Skeleton.field874); } @@ -227,7 +228,7 @@ public class Decimator { var9 = AccessFile.field7 - var5; var10 = ViewportMouse.field951 - var6; var11 = ViewportMouse.field952 - var7; - return Math.abs(var9) > var8 + GraphicsObject.field377 ? false : (Math.abs(var10) > var12 + ViewportMouse.field954 ? false : (Math.abs(var11) > var13 + class248.field1142 ? false : (Math.abs(var11 * class311.field1156 - var10 * Skeleton.field874) > var13 * ViewportMouse.field954 + var12 * class248.field1142 ? false : (Math.abs(var9 * Skeleton.field874 - var11 * ViewportMouse.field953) > var8 * class248.field1142 + var13 * GraphicsObject.field377 ? false : Math.abs(var10 * ViewportMouse.field953 - var9 * class311.field1156) <= var8 * ViewportMouse.field954 + var12 * GraphicsObject.field377)))); + return Math.abs(var9) > var8 + GraphicsObject.field377 ? false : (Math.abs(var10) > var12 + ViewportMouse.field954 ? false : (Math.abs(var11) > var13 + class248.field1142 ? false : (Math.abs(var11 * DefaultsGroup.field1156 - var10 * Skeleton.field874) > var13 * ViewportMouse.field954 + var12 * class248.field1142 ? false : (Math.abs(var9 * Skeleton.field874 - var11 * ViewportMouse.field953) > var8 * class248.field1142 + var13 * GraphicsObject.field377 ? false : Math.abs(var10 * ViewportMouse.field953 - var9 * DefaultsGroup.field1156) <= var8 * ViewportMouse.field954 + var12 * GraphicsObject.field377)))); } } @@ -237,7 +238,7 @@ public class Decimator { garbageValue = "-858740470" ) static int method2492(int var0, Script var1, boolean var2) { - if (var0 == 5630) { + if (var0 == ScriptOpcodes.LOGOUT) { Client.field175 = 250; return 1; } else { diff --git a/runescape-client/src/main/java/class311.java b/runescape-client/src/main/java/DefaultsGroup.java similarity index 66% rename from runescape-client/src/main/java/class311.java rename to runescape-client/src/main/java/DefaultsGroup.java index df7d2a1fa4..4ef75cf266 100644 --- a/runescape-client/src/main/java/class311.java +++ b/runescape-client/src/main/java/DefaultsGroup.java @@ -1,14 +1,18 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ka") -public class class311 { +@Implements("DefaultsGroup") +public class DefaultsGroup { @ObfuscatedName("m") @ObfuscatedSignature( signature = "Lka;" ) - static final class311 field3810; + @Export("DefaultsGroup_graphics") + static final DefaultsGroup DefaultsGroup_graphics; @ObfuscatedName("e") @ObfuscatedGetter( intValue = -2077113503 @@ -18,10 +22,11 @@ public class class311 { @ObfuscatedGetter( intValue = -800980069 ) - final int field3809; + @Export("group") + final int group; - class311(int var1) { - this.field3809 = var1; + DefaultsGroup(int var1) { + this.group = var1; } @ObfuscatedName("m") @@ -34,6 +39,6 @@ public class class311 { } static { - field3810 = new class311(3); + DefaultsGroup_graphics = new DefaultsGroup(3); } } diff --git a/runescape-client/src/main/java/DemotingHashTable.java b/runescape-client/src/main/java/DemotingHashTable.java index 28fb0907d2..0ff369a59b 100644 --- a/runescape-client/src/main/java/DemotingHashTable.java +++ b/runescape-client/src/main/java/DemotingHashTable.java @@ -39,8 +39,8 @@ public final class DemotingHashTable { @ObfuscatedName("m") @Export("get") - public Object get(long var1) { - Wrapper var3 = (Wrapper)this.hashTable.get(var1); + public Object get(long key) { + Wrapper var3 = (Wrapper)this.hashTable.get(key); if (var3 == null) { return null; } else { @@ -70,8 +70,8 @@ public final class DemotingHashTable { @ObfuscatedName("f") @Export("remove") - void remove(long var1) { - Wrapper var3 = (Wrapper)this.hashTable.get(var1); + void remove(long key) { + Wrapper var3 = (Wrapper)this.hashTable.get(key); this.removeWrapper(var3); } @@ -80,31 +80,31 @@ public final class DemotingHashTable { signature = "(Leu;)V" ) @Export("removeWrapper") - void removeWrapper(Wrapper var1) { - if (var1 != null) { - var1.remove(); - var1.removeDual(); - this.remaining += var1.size; + void removeWrapper(Wrapper wrapper) { + if (wrapper != null) { + wrapper.remove(); + wrapper.removeDual(); + this.remaining += wrapper.size; } } @ObfuscatedName("w") @Export("put") - public void put(Object var1, long var2, int var4) { - if (var4 > this.capacity) { + public void put(Object value, long key, int size) { + if (size > this.capacity) { throw new IllegalStateException(); } else { - this.remove(var2); - this.remaining -= var4; + this.remove(key); + this.remaining -= size; while (this.remaining < 0) { Wrapper var5 = (Wrapper)this.queue.removeLast(); this.removeWrapper(var5); } - DirectWrapper var6 = new DirectWrapper(var1, var4); - this.hashTable.put(var6, var2); + DirectWrapper var6 = new DirectWrapper(value, size); + this.hashTable.put(var6, key); this.queue.add(var6); var6.keyDual = 0L; } @@ -112,7 +112,7 @@ public final class DemotingHashTable { @ObfuscatedName("o") @Export("demote") - public void demote(int var1) { + public void demote(int softeningLevel) { for (Wrapper var2 = (Wrapper)this.queue.last(); var2 != null; var2 = (Wrapper)this.queue.previous()) { if (var2.isSoft()) { if (var2.get() == null) { @@ -120,7 +120,7 @@ public final class DemotingHashTable { var2.removeDual(); this.remaining += var2.size; } - } else if (++var2.keyDual > (long)var1) { + } else if (++var2.keyDual > (long)softeningLevel) { SoftWrapper var3 = new SoftWrapper(var2.get(), var2.size); this.hashTable.put(var3, var2.key); DualNodeDeque.DualNodeDeque_addBefore(var3, var2); diff --git a/runescape-client/src/main/java/DevicePcmPlayer.java b/runescape-client/src/main/java/DevicePcmPlayer.java index 894db8a282..e3d9693070 100644 --- a/runescape-client/src/main/java/DevicePcmPlayer.java +++ b/runescape-client/src/main/java/DevicePcmPlayer.java @@ -45,15 +45,15 @@ public class DevicePcmPlayer extends PcmPlayer { garbageValue = "-1738349775" ) @Export("open") - protected void open(int var1) throws LineUnavailableException { + protected void open(int bufferSize) throws LineUnavailableException { try { - Info var2 = new Info(SourceDataLine.class, this.format, var1 << (PcmPlayer.isStereo ? 2 : 1)); + Info var2 = new Info(SourceDataLine.class, this.format, bufferSize << (PcmPlayer.isStereo ? 2 : 1)); this.line = (SourceDataLine)AudioSystem.getLine(var2); this.line.open(); this.line.start(); - this.capacity2 = var1; + this.capacity2 = bufferSize; } catch (LineUnavailableException var5) { - int var3 = (var1 >>> 1 & 1431655765) + (var1 & 1431655765); + int var3 = (bufferSize >>> 1 & 1431655765) + (bufferSize & 1431655765); var3 = (var3 >>> 2 & 858993459) + (var3 & 858993459); var3 = (var3 >>> 4) + var3 & 252645135; var3 += var3 >>> 8; @@ -64,7 +64,7 @@ public class DevicePcmPlayer extends PcmPlayer { throw var5; } - this.open(World.method1759(var1)); + this.open(World.method1759(bufferSize)); } } diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java index 47738a89ea..4ced5dafce 100644 --- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java +++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java @@ -149,8 +149,8 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { signature = "([Lho;IIIIIIIII)V", garbageValue = "-1516599170" ) - @Export("drawWidgetGroup") - static final void drawWidgetGroup(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + @Export("drawInterface") + static final void drawInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); Rasterizer3D.Rasterizer3D_method1(); @@ -184,7 +184,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { if (var1 != -1412584499 && !var10.isScrollBar) { class279.field1145 = var0; class54.field1161 = var6; - class157.field1114 = var7; + BuddyRankComparator.field1114 = var7; continue; } @@ -328,12 +328,12 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { } } - drawWidgetGroup(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); + drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); if (var10.children != null) { - drawWidgetGroup(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); + drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); } - WidgetGroupParent var23 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var10.id); + InterfaceParent var23 = (InterfaceParent)Client.interfaceParents.get((long)var10.id); if (var23 != null) { Interpreter.drawWidgets(var23.group, var15, var16, var17, var18, var12, var13, var11); } @@ -344,7 +344,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { if (Client.isResizable || Client.field101[var11] || Client.gameDrawingMode > 1) { if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { - class11.method148(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight); + GrandExchangeOfferNameComparator.method148(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight); } if (var10.type != 1) { @@ -358,17 +358,17 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { for (var19 = 0; var19 < var10.rawHeight; ++var19) { for (var20 = 0; var20 < var10.rawWidth; ++var20) { var21 = var12 + var20 * (var10.paddingX + 32); - var33 = var13 + var19 * (var10.paddingY + 32); + var26 = var13 + var19 * (var10.paddingY + 32); if (var22 < 20) { var21 += var10.inventoryXOffsets[var22]; - var33 += var10.inventoryYOffsets[var22]; + var26 += var10.inventoryYOffsets[var22]; } if (var10.itemIds[var22] <= 0) { if (var10.inventorySprites != null && var22 < 20) { Sprite var36 = var10.getInventorySprite(var22); if (var36 != null) { - var36.drawAt2(var21, var33); + var36.drawAt2(var21, var26); } else if (Widget.field957) { class22.method295(var10); } @@ -376,38 +376,38 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { } else { boolean var35 = false; boolean var46 = false; - var26 = var10.itemIds[var22] - 1; - if (var21 + 32 > var2 && var21 < var4 && var33 + 32 > var3 && var33 < var5 || var10 == dragInventoryWidget && var22 == Client.dragItemSlotSource) { + var25 = var10.itemIds[var22] - 1; + if (var21 + 32 > var2 && var21 < var4 && var26 + 32 > var3 && var26 < var5 || var10 == dragInventoryWidget && var22 == Client.dragItemSlotSource) { Sprite var42; if (Client.isItemSelected == 1 && var22 == HealthBarDefinition.selectedItemSlot && var10.id == ServerPacket.selectedItemWidget) { - var42 = class226.getItemSprite(var26, var10.itemQuantities[var22], 2, 0, 2, false); + var42 = class226.getItemSprite(var25, var10.itemQuantities[var22], 2, 0, 2, false); } else { - var42 = class226.getItemSprite(var26, var10.itemQuantities[var22], 1, 3153952, 2, false); + var42 = class226.getItemSprite(var25, var10.itemQuantities[var22], 1, 3153952, 2, false); } if (var42 != null) { if (var10 == dragInventoryWidget && var22 == Client.dragItemSlotSource) { - var24 = MouseHandler.MouseHandler_x - Client.field205; - var25 = MouseHandler.MouseHandler_y - Client.field206; + var33 = MouseHandler.MouseHandler_x - Client.field205; + var24 = MouseHandler.MouseHandler_y - Client.field206; + if (var33 < 5 && var33 > -5) { + var33 = 0; + } + if (var24 < 5 && var24 > -5) { var24 = 0; } - if (var25 < 5 && var25 > -5) { - var25 = 0; - } - if (Client.itemDragDuration < 5) { + var33 = 0; var24 = 0; - var25 = 0; } - var42.method310(var21 + var24, var33 + var25, 128); + var42.method310(var21 + var33, var26 + var24, 128); if (var1 != -1) { Widget var47 = var0[var1 & 65535]; int var45; - if (var33 + var25 < Rasterizer2D.Rasterizer2D_yClipStart && var47.scrollY > 0) { - var45 = (Rasterizer2D.Rasterizer2D_yClipStart - var33 - var25) * Client.field183 / 3; + if (var26 + var24 < Rasterizer2D.Rasterizer2D_yClipStart && var47.scrollY > 0) { + var45 = (Rasterizer2D.Rasterizer2D_yClipStart - var26 - var24) * Client.field183 / 3; if (var45 > Client.field183 * 10) { var45 = Client.field183 * 10; } @@ -421,8 +421,8 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { class22.method295(var47); } - if (var25 + var33 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var47.scrollY < var47.scrollHeight - var47.height) { - var45 = (var33 + var25 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field183 / 3; + if (var24 + var26 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var47.scrollY < var47.scrollHeight - var47.height) { + var45 = (var26 + var24 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field183 / 3; if (var45 > Client.field183 * 10) { var45 = Client.field183 * 10; } @@ -437,9 +437,9 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { } } } else if (var10 == BoundaryObject.field40 && var22 == Client.field204) { - var42.method310(var21, var33, 128); + var42.method310(var21, var26, 128); } else { - var42.drawAt2(var21, var33); + var42.drawAt2(var21, var26); } } else { class22.method295(var10); @@ -569,16 +569,16 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { } else { Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); var21 = (var19 - 1 + var10.width) / var19; - var33 = (var20 - 1 + var10.height) / var20; + var26 = (var20 - 1 + var10.height) / var20; - for (var24 = 0; var24 < var21; ++var24) { - for (var25 = 0; var25 < var33; ++var25) { + for (var33 = 0; var33 < var21; ++var33) { + for (var24 = 0; var24 < var26; ++var24) { if (var10.spriteAngle != 0) { - var37.method317(var19 / 2 + var12 + var19 * var24, var20 / 2 + var13 + var25 * var20, var10.spriteAngle, 4096); + var37.method317(var19 / 2 + var12 + var19 * var33, var20 / 2 + var13 + var24 * var20, var10.spriteAngle, 4096); } else if (var14 != 0) { - var37.method310(var12 + var19 * var24, var13 + var20 * var25, 256 - (var14 & 255)); + var37.method310(var12 + var19 * var33, var13 + var20 * var24, 256 - (var14 & 255)); } else { - var37.drawAt2(var12 + var19 * var24, var13 + var25 * var20); + var37.drawAt2(var12 + var19 * var33, var13 + var24 * var20); } } } @@ -602,7 +602,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { if (var10.itemId != -1) { var28 = Skills.getItemDefinition(var10.itemId); if (var28 != null) { - var28 = var28.method144(var10.itemQuantity); + var28 = var28.getCountObj(var10.itemQuantity); var43 = var28.getModel(1); if (var43 != null) { var43.calculateBoundsCylinder(); @@ -631,17 +631,17 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { } Rasterizer3D.method2989(var10.width / 2 + var12, var10.height / 2 + var13); - var33 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; - var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; + var26 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; + var33 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; if (var43 != null) { if (!var10.isIf3) { - var43.method199(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var33, var24); + var43.method199(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var26, var33); } else { var43.calculateBoundsCylinder(); if (var10.modelOrthog) { - var43.method200(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var21 + var33 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); + var43.method200(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var21 + var26 + var10.modelOffsetY, var33 + var10.modelOffsetY, var10.modelZoom); } else { - var43.method199(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var33 + var21 + var10.modelOffsetY, var24 + var10.modelOffsetY); + var43.method199(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var26 + var21 + var10.modelOffsetY, var33 + var10.modelOffsetY); } } } @@ -670,14 +670,14 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { var29 = BufferedFile.colorStartTag(16748608) + var28.name + " " + 'x' + GrandExchangeEvent.method88(var10.itemQuantities[var19]); } - var25 = var21 * (var10.paddingX + 115) + var12; - var26 = var20 * (var10.paddingY + 12) + var13; + var24 = var21 * (var10.paddingX + 115) + var12; + var25 = var20 * (var10.paddingY + 12) + var13; if (var10.textXAlignment == 0) { - var27.draw(var29, var25, var26, var10.color, var10.textShadowed ? 0 : -1); + var27.draw(var29, var24, var25, var10.color, var10.textShadowed ? 0 : -1); } else if (var10.textXAlignment == 1) { - var27.drawCentered(var29, var10.width / 2 + var25, var26, var10.color, var10.textShadowed ? 0 : -1); + var27.drawCentered(var29, var10.width / 2 + var24, var25, var10.color, var10.textShadowed ? 0 : -1); } else { - var27.drawRightAligned(var29, var25 + var10.width - 1, var26, var10.color, var10.textShadowed ? 0 : -1); + var27.drawRightAligned(var29, var24 + var10.width - 1, var25, var10.color, var10.textShadowed ? 0 : -1); } } @@ -694,43 +694,43 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { String var31; for (var30 = MouseRecorder.method1194(var30, var10); var30.length() > 0; var19 = var19 + var39.ascent + 1) { - var24 = var30.indexOf("
"); - if (var24 != -1) { - var31 = var30.substring(0, var24); - var30 = var30.substring(var24 + 4); + var33 = var30.indexOf("
"); + if (var33 != -1) { + var31 = var30.substring(0, var33); + var30 = var30.substring(var33 + 4); } else { var31 = var30; var30 = ""; } - var25 = var39.stringWidth(var31); - if (var25 > var22) { - var22 = var25; + var24 = var39.stringWidth(var31); + if (var24 > var22) { + var22 = var24; } } var22 += 6; var19 += 7; - var24 = var12 + var10.width - 5 - var22; - var25 = var13 + var10.height + 5; - if (var24 < var12 + 5) { - var24 = var12 + 5; + var33 = var12 + var10.width - 5 - var22; + var24 = var13 + var10.height + 5; + if (var33 < var12 + 5) { + var33 = var12 + 5; } - if (var22 + var24 > var4) { - var24 = var4 - var22; + if (var22 + var33 > var4) { + var33 = var4 - var22; } - if (var25 + var19 > var5) { - var25 = var5 - var19; + if (var24 + var19 > var5) { + var24 = var5 - var19; } - Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var22, var19, 16777120); - Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var22, var19, 0); + Rasterizer2D.Rasterizer2D_fillRectangle(var33, var24, var22, var19, 16777120); + Rasterizer2D.Rasterizer2D_drawRectangle(var33, var24, var22, var19, 0); var30 = var10.text; - var26 = var25 + var39.ascent + 2; + var25 = var24 + var39.ascent + 2; - for (var30 = MouseRecorder.method1194(var30, var10); var30.length() > 0; var26 = var26 + var39.ascent + 1) { + for (var30 = MouseRecorder.method1194(var30, var10); var30.length() > 0; var25 = var25 + var39.ascent + 1) { int var32 = var30.indexOf("
"); if (var32 != -1) { var31 = var30.substring(0, var32); @@ -740,7 +740,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { var30 = ""; } - var39.draw(var31, var24 + 3, var26, 0, -1); + var39.draw(var31, var33 + 3, var25, 0, -1); } } @@ -781,8 +781,8 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { garbageValue = "-1666917204" ) static final void method845(int var0) { - if (GroundItemPile.loadWidgetGroup(var0)) { - Widget[] var1 = Widget.widgets[var0]; + if (GroundItemPile.loadInterface(var0)) { + Widget[] var1 = Widget.interfaceComponents[var0]; for (int var2 = 0; var2 < var1.length; ++var2) { Widget var3 = var1[var2]; diff --git a/runescape-client/src/main/java/DirectByteArrayCopier.java b/runescape-client/src/main/java/DirectByteArrayCopier.java index 0bf9f0d78a..e0280788db 100644 --- a/runescape-client/src/main/java/DirectByteArrayCopier.java +++ b/runescape-client/src/main/java/DirectByteArrayCopier.java @@ -30,9 +30,9 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier { garbageValue = "-2034091753" ) @Export("set") - void set(byte[] var1) { - this.directBuffer = ByteBuffer.allocateDirect(var1.length); + void set(byte[] array) { + this.directBuffer = ByteBuffer.allocateDirect(array.length); this.directBuffer.position(0); - this.directBuffer.put(var1); + this.directBuffer.put(array); } } diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java index 905d5408e6..ad287bbc64 100644 --- a/runescape-client/src/main/java/DynamicObject.java +++ b/runescape-client/src/main/java/DynamicObject.java @@ -6,6 +6,7 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("cf") @Implements("DynamicObject") @@ -208,21 +209,21 @@ public class DynamicObject extends Entity { garbageValue = "-83" ) static int method2223(int var0, Script var1, boolean var2) { - if (var0 == 5000) { + if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.publicChatMode; return 1; - } else if (var0 == 5001) { + } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { RouteStrategy.Interpreter_intStackSize -= 3; Client.publicChatMode = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; - IndexCacheLoader.field512 = WorldMapElement.method4783(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); - if (IndexCacheLoader.field512 == null) { - IndexCacheLoader.field512 = class310.field3805; + ArchiveLoader.field512 = WorldMapElement.method4783(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); + if (ArchiveLoader.field512 == null) { + ArchiveLoader.field512 = class310.field3805; } Client.field138 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; PacketBufferNode var15 = Interpreter.method1915(ClientPacket.field237, Client.packetWriter.isaacCipher); var15.packetBuffer.writeByte(Client.publicChatMode); - var15.packetBuffer.writeByte(IndexCacheLoader.field512.field3804); + var15.packetBuffer.writeByte(ArchiveLoader.field512.field3804); var15.packetBuffer.writeByte(Client.field138); Client.packetWriter.method241(var15); return 1; @@ -230,32 +231,32 @@ public class DynamicObject extends Entity { String var3; int var4; int var5; - if (var0 == 5002) { + if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; RouteStrategy.Interpreter_intStackSize -= 2; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; - PacketBufferNode var13 = Interpreter.method1915(ClientPacket.field260, Client.packetWriter.isaacCipher); - var13.packetBuffer.writeByte(WorldMapRegion.method550(var3) + 2); - var13.packetBuffer.writeStringCp1252NullTerminated(var3); - var13.packetBuffer.writeByte(var4 - 1); - var13.packetBuffer.writeByte(var5); - Client.packetWriter.method241(var13); + PacketBufferNode var12 = Interpreter.method1915(ClientPacket.field260, Client.packetWriter.isaacCipher); + var12.packetBuffer.writeByte(WorldMapRegion.stringCp1252NullTerminatedByteSize(var3) + 2); + var12.packetBuffer.writeStringCp1252NullTerminated(var3); + var12.packetBuffer.writeByte(var4 - 1); + var12.packetBuffer.writeByte(var5); + Client.packetWriter.method241(var12); return 1; } else { - Message var11; - if (var0 == 5003) { + Message var6; + if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { RouteStrategy.Interpreter_intStackSize -= 2; var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; - var11 = Message.method1226(var5, var4); - if (var11 != null) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.count; - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.cycle; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.sender != null ? var11.sender : ""; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.prefix != null ? var11.prefix : ""; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.text != null ? var11.text : ""; - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.isFromFriend() ? 1 : (var11.isFromIgnored() ? 2 : 0); + var6 = Message.method1226(var5, var4); + if (var6 != null) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.count; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.cycle; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.sender != null ? var6.sender : ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.prefix != null ? var6.prefix : ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.text != null ? var6.text : ""; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.isFromFriend() ? 1 : (var6.isFromIgnored() ? 2 : 0); } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; @@ -266,16 +267,16 @@ public class DynamicObject extends Entity { } return 1; - } else if (var0 == 5004) { + } else if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - var11 = NetCache.method4708(var5); - if (var11 != null) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.type; - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.cycle; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.sender != null ? var11.sender : ""; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.prefix != null ? var11.prefix : ""; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.text != null ? var11.text : ""; - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.isFromFriend() ? 1 : (var11.isFromIgnored() ? 2 : 0); + var6 = NetCache.method4708(var5); + if (var6 != null) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.type; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.cycle; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.sender != null ? var6.sender : ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.prefix != null ? var6.prefix : ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.text != null ? var6.text : ""; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.isFromFriend() ? 1 : (var6.isFromIgnored() ? 2 : 0); } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; @@ -286,179 +287,179 @@ public class DynamicObject extends Entity { } return 1; - } else if (var0 == 5005) { - if (IndexCacheLoader.field512 == null) { + } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { + if (ArchiveLoader.field512 == null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = IndexCacheLoader.field512.field3804; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ArchiveLoader.field512.field3804; } return 1; } else { - String var6; - if (var0 == 5008) { + String var7; + if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - var6 = var3.toLowerCase(); - byte var12 = 0; - if (var6.startsWith("yellow:")) { - var12 = 0; + var7 = var3.toLowerCase(); + byte var13 = 0; + if (var7.startsWith("yellow:")) { + var13 = 0; var3 = var3.substring("yellow:".length()); - } else if (var6.startsWith("red:")) { - var12 = 1; + } else if (var7.startsWith("red:")) { + var13 = 1; var3 = var3.substring("red:".length()); - } else if (var6.startsWith("green:")) { - var12 = 2; + } else if (var7.startsWith("green:")) { + var13 = 2; var3 = var3.substring("green:".length()); - } else if (var6.startsWith("cyan:")) { - var12 = 3; + } else if (var7.startsWith("cyan:")) { + var13 = 3; var3 = var3.substring("cyan:".length()); - } else if (var6.startsWith("purple:")) { - var12 = 4; + } else if (var7.startsWith("purple:")) { + var13 = 4; var3 = var3.substring("purple:".length()); - } else if (var6.startsWith("white:")) { - var12 = 5; + } else if (var7.startsWith("white:")) { + var13 = 5; var3 = var3.substring("white:".length()); - } else if (var6.startsWith("flash1:")) { - var12 = 6; + } else if (var7.startsWith("flash1:")) { + var13 = 6; var3 = var3.substring("flash1:".length()); - } else if (var6.startsWith("flash2:")) { - var12 = 7; + } else if (var7.startsWith("flash2:")) { + var13 = 7; var3 = var3.substring("flash2:".length()); - } else if (var6.startsWith("flash3:")) { - var12 = 8; + } else if (var7.startsWith("flash3:")) { + var13 = 8; var3 = var3.substring("flash3:".length()); - } else if (var6.startsWith("glow1:")) { - var12 = 9; + } else if (var7.startsWith("glow1:")) { + var13 = 9; var3 = var3.substring("glow1:".length()); - } else if (var6.startsWith("glow2:")) { - var12 = 10; + } else if (var7.startsWith("glow2:")) { + var13 = 10; var3 = var3.substring("glow2:".length()); - } else if (var6.startsWith("glow3:")) { - var12 = 11; + } else if (var7.startsWith("glow3:")) { + var13 = 11; var3 = var3.substring("glow3:".length()); } else if (Client.language != 0) { - if (var6.startsWith("yellow:")) { - var12 = 0; + if (var7.startsWith("yellow:")) { + var13 = 0; var3 = var3.substring("yellow:".length()); - } else if (var6.startsWith("red:")) { - var12 = 1; + } else if (var7.startsWith("red:")) { + var13 = 1; var3 = var3.substring("red:".length()); - } else if (var6.startsWith("green:")) { - var12 = 2; + } else if (var7.startsWith("green:")) { + var13 = 2; var3 = var3.substring("green:".length()); - } else if (var6.startsWith("cyan:")) { - var12 = 3; + } else if (var7.startsWith("cyan:")) { + var13 = 3; var3 = var3.substring("cyan:".length()); - } else if (var6.startsWith("purple:")) { - var12 = 4; + } else if (var7.startsWith("purple:")) { + var13 = 4; var3 = var3.substring("purple:".length()); - } else if (var6.startsWith("white:")) { - var12 = 5; + } else if (var7.startsWith("white:")) { + var13 = 5; var3 = var3.substring("white:".length()); - } else if (var6.startsWith("flash1:")) { - var12 = 6; + } else if (var7.startsWith("flash1:")) { + var13 = 6; var3 = var3.substring("flash1:".length()); - } else if (var6.startsWith("flash2:")) { - var12 = 7; + } else if (var7.startsWith("flash2:")) { + var13 = 7; var3 = var3.substring("flash2:".length()); - } else if (var6.startsWith("flash3:")) { - var12 = 8; + } else if (var7.startsWith("flash3:")) { + var13 = 8; var3 = var3.substring("flash3:".length()); - } else if (var6.startsWith("glow1:")) { - var12 = 9; + } else if (var7.startsWith("glow1:")) { + var13 = 9; var3 = var3.substring("glow1:".length()); - } else if (var6.startsWith("glow2:")) { - var12 = 10; + } else if (var7.startsWith("glow2:")) { + var13 = 10; var3 = var3.substring("glow2:".length()); - } else if (var6.startsWith("glow3:")) { - var12 = 11; + } else if (var7.startsWith("glow3:")) { + var13 = 11; var3 = var3.substring("glow3:".length()); } } - var6 = var3.toLowerCase(); + var7 = var3.toLowerCase(); byte var14 = 0; - if (var6.startsWith("wave:")) { + if (var7.startsWith("wave:")) { var14 = 1; var3 = var3.substring("wave:".length()); - } else if (var6.startsWith("wave2:")) { + } else if (var7.startsWith("wave2:")) { var14 = 2; var3 = var3.substring("wave2:".length()); - } else if (var6.startsWith("shake:")) { + } else if (var7.startsWith("shake:")) { var14 = 3; var3 = var3.substring("shake:".length()); - } else if (var6.startsWith("scroll:")) { + } else if (var7.startsWith("scroll:")) { var14 = 4; var3 = var3.substring("scroll:".length()); - } else if (var6.startsWith("slide:")) { + } else if (var7.startsWith("slide:")) { var14 = 5; var3 = var3.substring("slide:".length()); } else if (Client.language != 0) { - if (var6.startsWith("wave:")) { + if (var7.startsWith("wave:")) { var14 = 1; var3 = var3.substring("wave:".length()); - } else if (var6.startsWith("wave2:")) { + } else if (var7.startsWith("wave2:")) { var14 = 2; var3 = var3.substring("wave2:".length()); - } else if (var6.startsWith("shake:")) { + } else if (var7.startsWith("shake:")) { var14 = 3; var3 = var3.substring("shake:".length()); - } else if (var6.startsWith("scroll:")) { + } else if (var7.startsWith("scroll:")) { var14 = 4; var3 = var3.substring("scroll:".length()); - } else if (var6.startsWith("slide:")) { + } else if (var7.startsWith("slide:")) { var14 = 5; var3 = var3.substring("slide:".length()); } } - PacketBufferNode var9 = Interpreter.method1915(ClientPacket.field319, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeByte(0); - int var10 = var9.packetBuffer.index; - var9.packetBuffer.writeByte(var4); - var9.packetBuffer.writeByte(var12); - var9.packetBuffer.writeByte(var14); - TextureProvider.method2777(var9.packetBuffer, var3); - var9.packetBuffer.method41(var9.packetBuffer.index - var10); - Client.packetWriter.method241(var9); + PacketBufferNode var10 = Interpreter.method1915(ClientPacket.field319, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeByte(0); + int var11 = var10.packetBuffer.index; + var10.packetBuffer.writeByte(var4); + var10.packetBuffer.writeByte(var13); + var10.packetBuffer.writeByte(var14); + TextureProvider.method2777(var10.packetBuffer, var3); + var10.packetBuffer.method41(var10.packetBuffer.index - var11); + Client.packetWriter.method241(var10); return 1; - } else if (var0 == 5009) { + } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { Interpreter.Interpreter_stringStackSize -= 2; var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; - var6 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; - PacketBufferNode var7 = Interpreter.method1915(ClientPacket.field247, Client.packetWriter.isaacCipher); - var7.packetBuffer.writeShort(0); - int var8 = var7.packetBuffer.index; - var7.packetBuffer.writeStringCp1252NullTerminated(var3); - TextureProvider.method2777(var7.packetBuffer, var6); - var7.packetBuffer.method40(var7.packetBuffer.index - var8); - Client.packetWriter.method241(var7); + var7 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; + PacketBufferNode var8 = Interpreter.method1915(ClientPacket.field247, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShort(0); + int var9 = var8.packetBuffer.index; + var8.packetBuffer.writeStringCp1252NullTerminated(var3); + TextureProvider.method2777(var8.packetBuffer, var7); + var8.packetBuffer.method40(var8.packetBuffer.index - var9); + Client.packetWriter.method241(var8); return 1; - } else if (var0 != 5015) { - if (var0 == 5016) { + } else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { + if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.field138; return 1; - } else if (var0 == 5017) { + } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WidgetGroupParent.method1174(var5); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = InterfaceParent.method1174(var5); return 1; - } else if (var0 == 5018) { + } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class12.method161(var5); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.method161(var5); return 1; - } else if (var0 == 5019) { + } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = SpriteMask.method4391(var5); return 1; - } else if (var0 == 5020) { + } else if (var0 == ScriptOpcodes.DOCHEAT) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; BoundaryObject.doCheat(var3); return 1; - } else if (var0 == 5021) { + } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { Client.field158 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize].toLowerCase().trim(); return 1; - } else if (var0 == 5022) { + } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Client.field158; return 1; } else if (var0 == 5023) { @@ -490,14 +491,14 @@ public class DynamicObject extends Entity { ) protected static int method2222() { int var0 = 0; - if (AbstractIndexCache.garbageCollector == null || !AbstractIndexCache.garbageCollector.isValid()) { + if (AbstractArchive.garbageCollector == null || !AbstractArchive.garbageCollector.isValid()) { try { Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); while (var1.hasNext()) { GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); if (var2.isValid()) { - AbstractIndexCache.garbageCollector = var2; + AbstractArchive.garbageCollector = var2; GameShell.garbageCollectorLastCheckTimeMs = -1L; GameShell.garbageCollectorLastCollectionTime = -1L; } @@ -506,9 +507,9 @@ public class DynamicObject extends Entity { } } - if (AbstractIndexCache.garbageCollector != null) { + if (AbstractArchive.garbageCollector != null) { long var10 = class203.currentTimeMs(); - long var3 = AbstractIndexCache.garbageCollector.getCollectionTime(); + long var3 = AbstractArchive.garbageCollector.getCollectionTime(); if (GameShell.garbageCollectorLastCollectionTime != -1L) { long var5 = var3 - GameShell.garbageCollectorLastCollectionTime; long var7 = var10 - GameShell.garbageCollectorLastCheckTimeMs; @@ -546,76 +547,76 @@ public class DynamicObject extends Entity { int var7; int var8; - int[] var10000; + int[] var9; for (var7 = 0; var7 < 32768; ++var7) { - NPC var9 = Client.npcs[var7]; - if (var9 != null) { + NPC var10 = Client.npcs[var7]; + if (var10 != null) { for (var8 = 0; var8 < 10; ++var8) { - var10000 = var9.pathX; - var10000[var8] -= var5; - var10000 = var9.pathY; - var10000[var8] -= var6; + var9 = var10.pathX; + var9[var8] -= var5; + var9 = var10.pathY; + var9[var8] -= var6; } - var9.x -= var5 * 128; - var9.y -= var6 * 128; + var10.x -= var5 * 128; + var10.y -= var6 * 128; } } for (var7 = 0; var7 < 2048; ++var7) { - Player var20 = Client.players[var7]; - if (var20 != null) { + Player var21 = Client.players[var7]; + if (var21 != null) { for (var8 = 0; var8 < 10; ++var8) { - var10000 = var20.pathX; - var10000[var8] -= var5; - var10000 = var20.pathY; - var10000[var8] -= var6; + var9 = var21.pathX; + var9[var8] -= var5; + var9 = var21.pathY; + var9[var8] -= var6; } - var20.x -= var5 * 128; - var20.y -= var6 * 128; + var21.x -= var5 * 128; + var21.y -= var6 * 128; } } - byte var21 = 0; - byte var10 = 104; - byte var11 = 1; + byte var22 = 0; + byte var11 = 104; + byte var12 = 1; if (var5 < 0) { - var21 = 103; - var10 = -1; + var22 = 103; var11 = -1; + var12 = -1; } - byte var12 = 0; - byte var13 = 104; - byte var14 = 1; + byte var13 = 0; + byte var14 = 104; + byte var15 = 1; if (var6 < 0) { - var12 = 103; - var13 = -1; + var13 = 103; var14 = -1; + var15 = -1; } - int var15; - for (int var16 = var21; var16 != var10; var16 += var11) { - for (var15 = var12; var13 != var15; var15 += var14) { - int var17 = var16 + var5; - int var18 = var15 + var6; + int var16; + for (int var17 = var22; var17 != var11; var17 += var12) { + for (var16 = var13; var14 != var16; var16 += var15) { + int var18 = var17 + var5; + int var19 = var16 + var6; - for (int var19 = 0; var19 < 4; ++var19) { - if (var17 >= 0 && var18 >= 0 && var17 < 104 && var18 < 104) { - Client.groundItems[var19][var16][var15] = Client.groundItems[var19][var17][var18]; + for (int var20 = 0; var20 < 4; ++var20) { + if (var18 >= 0 && var19 >= 0 && var18 < 104 && var19 < 104) { + Client.groundItems[var20][var17][var16] = Client.groundItems[var20][var18][var19]; } else { - Client.groundItems[var19][var16][var15] = null; + Client.groundItems[var20][var17][var16] = null; } } } } - for (PendingSpawn var22 = (PendingSpawn)Client.pendingSpawns.last(); var22 != null; var22 = (PendingSpawn)Client.pendingSpawns.previous()) { - var22.x -= var5; - var22.y -= var6; - if (var22.x < 0 || var22.y < 0 || var22.x >= 104 || var22.y >= 104) { - var22.remove(); + for (PendingSpawn var23 = (PendingSpawn)Client.pendingSpawns.last(); var23 != null; var23 = (PendingSpawn)Client.pendingSpawns.previous()) { + var23.x -= var5; + var23.y -= var6; + if (var23.x < 0 || var23.y < 0 || var23.x >= 104 || var23.y >= 104) { + var23.remove(); } } @@ -627,15 +628,15 @@ public class DynamicObject extends Entity { Client.soundEffectCount = 0; Client.isCameraLocked = false; WorldMapSection1.cameraX -= var5 << 7; - class11.cameraZ -= var6 << 7; + GrandExchangeOfferNameComparator.cameraZ -= var6 << 7; MouseHandler.oculusOrbFocalPointX -= var5 << 7; ScriptEvent.oculusOrbFocalPointY -= var6 << 7; Client.field125 = -1; Client.graphicsObjects.clear(); Client.projectiles.clear(); - for (var15 = 0; var15 < 4; ++var15) { - Client.collisionMaps[var15].clear(); + for (var16 = 0; var16 < 4; ++var16) { + Client.collisionMaps[var16].clear(); } } diff --git a/runescape-client/src/main/java/Entity.java b/runescape-client/src/main/java/Entity.java index e0778c1f42..556d76c21a 100644 --- a/runescape-client/src/main/java/Entity.java +++ b/runescape-client/src/main/java/Entity.java @@ -29,12 +29,12 @@ public abstract class Entity extends DualNode { } @ObfuscatedName("cy") - @Export("renderDraw") - void renderDraw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { + @Export("draw") + void draw(int yaw, int cameraPitchSine, int cameraPitchCosine, int cameraYawSine, int cameraYawCosine, int x, int y, int var8, long tag) { Model var11 = this.getModel(); if (var11 != null) { this.height = var11.height; - var11.renderDraw(var1, var2, var3, var4, var5, var6, var7, var8, var9); + var11.draw(yaw, cameraPitchSine, cameraPitchCosine, cameraYawSine, cameraYawCosine, x, y, var8, tag); } } diff --git a/runescape-client/src/main/java/EnumDefinition.java b/runescape-client/src/main/java/EnumDefinition.java index dbd78a607c..428f82137e 100644 --- a/runescape-client/src/main/java/EnumDefinition.java +++ b/runescape-client/src/main/java/EnumDefinition.java @@ -11,8 +11,8 @@ public class EnumDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("EnumDefinition_indexCache") - public static AbstractIndexCache EnumDefinition_indexCache; + @Export("EnumDefinition_archive") + public static AbstractArchive EnumDefinition_archive; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Ler;" @@ -20,14 +20,14 @@ public class EnumDefinition extends DualNode { @Export("EnumDefinition_cached") static EvictingDualNodeHashTable EnumDefinition_cached; @ObfuscatedName("q") - @Export("keyType") - public char keyType; + @Export("inputType") + public char inputType; @ObfuscatedName("w") - @Export("valType") - public char valType; + @Export("outputType") + public char outputType; @ObfuscatedName("o") - @Export("defaultString") - public String defaultString; + @Export("defaultStr") + public String defaultStr; @ObfuscatedName("u") @ObfuscatedGetter( intValue = 1948115527 @@ -38,8 +38,8 @@ public class EnumDefinition extends DualNode { @ObfuscatedGetter( intValue = -12324053 ) - @Export("size0") - public int size0; + @Export("outputCount") + public int outputCount; @ObfuscatedName("l") @Export("keys") public int[] keys; @@ -47,12 +47,12 @@ public class EnumDefinition extends DualNode { @Export("intVals") public int[] intVals; @ObfuscatedName("x") - @Export("stringVals") - public String[] stringVals; + @Export("strVals") + public String[] strVals; EnumDefinition() { - this.defaultString = "null"; - this.size0 = 0; + this.defaultStr = "null"; + this.outputCount = 0; } @ObfuscatedName("f") @@ -60,15 +60,15 @@ public class EnumDefinition extends DualNode { signature = "(Lgr;I)V", garbageValue = "-230039710" ) - @Export("read") - void read(Buffer var1) { + @Export("decode") + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -77,33 +77,33 @@ public class EnumDefinition extends DualNode { signature = "(Lgr;II)V", garbageValue = "-1255400805" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { if (var2 == 1) { - this.keyType = (char)var1.readUnsignedByte(); + this.inputType = (char)var1.readUnsignedByte(); } else if (var2 == 2) { - this.valType = (char)var1.readUnsignedByte(); + this.outputType = (char)var1.readUnsignedByte(); } else if (var2 == 3) { - this.defaultString = var1.readStringCp1252NullTerminated(); + this.defaultStr = var1.readStringCp1252NullTerminated(); } else if (var2 == 4) { this.defaultInt = var1.readInt(); } else { int var3; if (var2 == 5) { - this.size0 = var1.readUnsignedShort(); - this.keys = new int[this.size0]; - this.stringVals = new String[this.size0]; + this.outputCount = var1.readUnsignedShort(); + this.keys = new int[this.outputCount]; + this.strVals = new String[this.outputCount]; - for (var3 = 0; var3 < this.size0; ++var3) { + for (var3 = 0; var3 < this.outputCount; ++var3) { this.keys[var3] = var1.readInt(); - this.stringVals[var3] = var1.readStringCp1252NullTerminated(); + this.strVals[var3] = var1.readStringCp1252NullTerminated(); } } else if (var2 == 6) { - this.size0 = var1.readUnsignedShort(); - this.keys = new int[this.size0]; - this.intVals = new int[this.size0]; + this.outputCount = var1.readUnsignedShort(); + this.keys = new int[this.outputCount]; + this.intVals = new int[this.outputCount]; - for (var3 = 0; var3 < this.size0; ++var3) { + for (var3 = 0; var3 < this.outputCount; ++var3) { this.keys[var3] = var1.readInt(); this.intVals[var3] = var1.readInt(); } @@ -119,7 +119,7 @@ public class EnumDefinition extends DualNode { ) @Export("size") public int size() { - return this.size0; + return this.outputCount; } static { diff --git a/runescape-client/src/main/java/EvictingDualNodeHashTable.java b/runescape-client/src/main/java/EvictingDualNodeHashTable.java index f05386d31e..9ab1d0b28a 100644 --- a/runescape-client/src/main/java/EvictingDualNodeHashTable.java +++ b/runescape-client/src/main/java/EvictingDualNodeHashTable.java @@ -48,8 +48,8 @@ public final class EvictingDualNodeHashTable { signature = "(J)Lfn;" ) @Export("get") - public DualNode get(long var1) { - DualNode var3 = (DualNode)this.hashTable.get(var1); + public DualNode get(long key) { + DualNode var3 = (DualNode)this.hashTable.get(key); if (var3 != null) { this.deque.addFirst(var3); } @@ -59,8 +59,8 @@ public final class EvictingDualNodeHashTable { @ObfuscatedName("f") @Export("remove") - public void remove(long var1) { - DualNode var3 = (DualNode)this.hashTable.get(var1); + public void remove(long key) { + DualNode var3 = (DualNode)this.hashTable.get(key); if (var3 != null) { var3.remove(); var3.removeDual(); @@ -74,7 +74,7 @@ public final class EvictingDualNodeHashTable { signature = "(Lfn;J)V" ) @Export("put") - public void put(DualNode var1, long var2) { + public void put(DualNode value, long key) { if (this.remainingCapacity == 0) { DualNode var4 = this.deque.removeLast(); var4.remove(); @@ -88,8 +88,8 @@ public final class EvictingDualNodeHashTable { --this.remainingCapacity; } - this.hashTable.put(var1, var2); - this.deque.addFirst(var1); + this.hashTable.put(value, key); + this.deque.addFirst(value); } @ObfuscatedName("w") diff --git a/runescape-client/src/main/java/FaceNormal.java b/runescape-client/src/main/java/FaceNormal.java index 4257d4d4b5..a2cfb61b8c 100644 --- a/runescape-client/src/main/java/FaceNormal.java +++ b/runescape-client/src/main/java/FaceNormal.java @@ -41,13 +41,13 @@ public class FaceNormal { garbageValue = "-1788849120" ) static Script method3236(int var0, int var1, int var2) { - int var3 = UnitPriceComparator.method125(var1, var0); - Script var4 = WidgetGroupParent.method1175(var3, var0); + int var3 = GrandExchangeOfferUnitPriceComparator.method125(var1, var0); + Script var4 = InterfaceParent.method1175(var3, var0); if (var4 != null) { return var4; } else { var3 = PacketBuffer.method4081(var2, var0); - var4 = WidgetGroupParent.method1175(var3, var0); + var4 = InterfaceParent.method1175(var3, var0); return var4 != null ? var4 : null; } } diff --git a/runescape-client/src/main/java/FloorDecoration.java b/runescape-client/src/main/java/FloorDecoration.java index 83b04eb080..b5f03505cc 100644 --- a/runescape-client/src/main/java/FloorDecoration.java +++ b/runescape-client/src/main/java/FloorDecoration.java @@ -61,57 +61,57 @@ public final class FloorDecoration { signature = "(Lir;Lir;I)I", garbageValue = "-1749538901" ) - static int method2853(AbstractIndexCache var0, AbstractIndexCache var1) { + static int method2853(AbstractArchive var0, AbstractArchive var1) { int var2 = 0; - if (var0.tryLoadRecordByNames("title.jpg", "")) { + if (var0.tryLoadFileByNames("title.jpg", "")) { ++var2; } - if (var1.tryLoadRecordByNames("logo", "")) { + if (var1.tryLoadFileByNames("logo", "")) { ++var2; } - if (var1.tryLoadRecordByNames("logo_deadman_mode", "")) { + if (var1.tryLoadFileByNames("logo_deadman_mode", "")) { ++var2; } - if (var1.tryLoadRecordByNames("titlebox", "")) { + if (var1.tryLoadFileByNames("titlebox", "")) { ++var2; } - if (var1.tryLoadRecordByNames("titlebutton", "")) { + if (var1.tryLoadFileByNames("titlebutton", "")) { ++var2; } - if (var1.tryLoadRecordByNames("runes", "")) { + if (var1.tryLoadFileByNames("runes", "")) { ++var2; } - if (var1.tryLoadRecordByNames("title_mute", "")) { + if (var1.tryLoadFileByNames("title_mute", "")) { ++var2; } - if (var1.tryLoadRecordByNames("options_radio_buttons,0", "")) { + if (var1.tryLoadFileByNames("options_radio_buttons,0", "")) { ++var2; } - if (var1.tryLoadRecordByNames("options_radio_buttons,2", "")) { + if (var1.tryLoadFileByNames("options_radio_buttons,2", "")) { ++var2; } - if (var1.tryLoadRecordByNames("options_radio_buttons,4", "")) { + if (var1.tryLoadFileByNames("options_radio_buttons,4", "")) { ++var2; } - if (var1.tryLoadRecordByNames("options_radio_buttons,6", "")) { + if (var1.tryLoadFileByNames("options_radio_buttons,6", "")) { ++var2; } - var1.tryLoadRecordByNames("sl_back", ""); - var1.tryLoadRecordByNames("sl_flags", ""); - var1.tryLoadRecordByNames("sl_arrows", ""); - var1.tryLoadRecordByNames("sl_stars", ""); - var1.tryLoadRecordByNames("sl_button", ""); + var1.tryLoadFileByNames("sl_back", ""); + var1.tryLoadFileByNames("sl_flags", ""); + var1.tryLoadFileByNames("sl_arrows", ""); + var1.tryLoadFileByNames("sl_stars", ""); + var1.tryLoadFileByNames("sl_button", ""); return var2; } } diff --git a/runescape-client/src/main/java/OverlayDefinition.java b/runescape-client/src/main/java/FloorOverlayDefinition.java similarity index 68% rename from runescape-client/src/main/java/OverlayDefinition.java rename to runescape-client/src/main/java/FloorOverlayDefinition.java index 63a376eb61..2568f46343 100644 --- a/runescape-client/src/main/java/OverlayDefinition.java +++ b/runescape-client/src/main/java/FloorOverlayDefinition.java @@ -5,13 +5,13 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("jf") -@Implements("OverlayDefinition") -public class OverlayDefinition extends DualNode { +@Implements("FloorOverlayDefinition") +public class FloorOverlayDefinition extends DualNode { @ObfuscatedName("m") @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field663; + public static AbstractArchive field663; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Ler;" @@ -74,7 +74,7 @@ public class OverlayDefinition extends DualNode { @Export("lightness2") public int lightness2; - public OverlayDefinition() { + public FloorOverlayDefinition() { this.rgb = 0; this.texture = -1; this.field665 = true; @@ -86,8 +86,8 @@ public class OverlayDefinition extends DualNode { signature = "(I)V", garbageValue = "867788548" ) - @Export("init") - public void init() { + @Export("postDecode") + public void postDecode() { if (this.rgb2 != -1) { this.setHsl(this.rgb2); this.hue2 = this.hue; @@ -103,15 +103,15 @@ public class OverlayDefinition extends DualNode { signature = "(Lgr;II)V", garbageValue = "-424203051" ) - @Export("read") - public void read(Buffer var1, int var2) { + @Export("decode") + public void decode(Buffer var1, int var2) { while (true) { int var3 = var1.readUnsignedByte(); if (var3 == 0) { return; } - this.readNext(var1, var3, var2); + this.decodeNext(var1, var3, var2); } } @@ -120,8 +120,8 @@ public class OverlayDefinition extends DualNode { signature = "(Lgr;III)V", garbageValue = "2094105763" ) - @Export("readNext") - void readNext(Buffer var1, int var2, int var3) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2, int var3) { if (var2 == 1) { this.rgb = var1.readMedium(); } else if (var2 == 2) { @@ -141,10 +141,10 @@ public class OverlayDefinition extends DualNode { garbageValue = "489697731" ) @Export("setHsl") - void setHsl(int var1) { - double var2 = (double)(var1 >> 16 & 255) / 256.0D; - double var4 = (double)(var1 >> 8 & 255) / 256.0D; - double var6 = (double)(var1 & 255) / 256.0D; + void setHsl(int rgb) { + double var2 = (double)(rgb >> 16 & 255) / 256.0D; + double var4 = (double)(rgb >> 8 & 255) / 256.0D; + double var6 = (double)(rgb & 255) / 256.0D; double var8 = var2; if (var4 < var2) { var8 = var4; @@ -208,33 +208,33 @@ public class OverlayDefinition extends DualNode { garbageValue = "30" ) @Export("alignWidgetPosition") - static void alignWidgetPosition(Widget var0, int var1, int var2) { - if (var0.xAlignment == 0) { - var0.x = var0.rawX; - } else if (var0.xAlignment == 1) { - var0.x = var0.rawX + (var1 - var0.width) / 2; - } else if (var0.xAlignment == 2) { - var0.x = var1 - var0.width - var0.rawX; - } else if (var0.xAlignment == 3) { - var0.x = var0.rawX * var1 >> 14; - } else if (var0.xAlignment == 4) { - var0.x = (var0.rawX * var1 >> 14) + (var1 - var0.width) / 2; + static void alignWidgetPosition(Widget component, int parentWidth, int parentHeight) { + if (component.xAlignment == 0) { + component.x = component.rawX; + } else if (component.xAlignment == 1) { + component.x = component.rawX + (parentWidth - component.width) / 2; + } else if (component.xAlignment == 2) { + component.x = parentWidth - component.width - component.rawX; + } else if (component.xAlignment == 3) { + component.x = component.rawX * parentWidth >> 14; + } else if (component.xAlignment == 4) { + component.x = (component.rawX * parentWidth >> 14) + (parentWidth - component.width) / 2; } else { - var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); + component.x = parentWidth - component.width - (component.rawX * parentWidth >> 14); } - if (var0.yAlignment == 0) { - var0.y = var0.rawY; - } else if (var0.yAlignment == 1) { - var0.y = (var2 - var0.height) / 2 + var0.rawY; - } else if (var0.yAlignment == 2) { - var0.y = var2 - var0.height - var0.rawY; - } else if (var0.yAlignment == 3) { - var0.y = var2 * var0.rawY >> 14; - } else if (var0.yAlignment == 4) { - var0.y = (var2 * var0.rawY >> 14) + (var2 - var0.height) / 2; + if (component.yAlignment == 0) { + component.y = component.rawY; + } else if (component.yAlignment == 1) { + component.y = (parentHeight - component.height) / 2 + component.rawY; + } else if (component.yAlignment == 2) { + component.y = parentHeight - component.height - component.rawY; + } else if (component.yAlignment == 3) { + component.y = parentHeight * component.rawY >> 14; + } else if (component.yAlignment == 4) { + component.y = (parentHeight * component.rawY >> 14) + (parentHeight - component.height) / 2; } else { - var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); + component.y = parentHeight - component.height - (parentHeight * component.rawY >> 14); } } diff --git a/runescape-client/src/main/java/UnderlayDefinition.java b/runescape-client/src/main/java/FloorUnderlayDefinition.java similarity index 81% rename from runescape-client/src/main/java/UnderlayDefinition.java rename to runescape-client/src/main/java/FloorUnderlayDefinition.java index 8ebdfe0da9..2dc2ec26c4 100644 --- a/runescape-client/src/main/java/UnderlayDefinition.java +++ b/runescape-client/src/main/java/FloorUnderlayDefinition.java @@ -5,20 +5,20 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ih") -@Implements("UnderlayDefinition") -public class UnderlayDefinition extends DualNode { +@Implements("FloorUnderlayDefinition") +public class FloorUnderlayDefinition extends DualNode { @ObfuscatedName("m") @ObfuscatedSignature( signature = "Lir;" ) - @Export("UnderlayDefinition_indexCache") - static AbstractIndexCache UnderlayDefinition_indexCache; + @Export("FloorUnderlayDefinition_archive") + static AbstractArchive FloorUnderlayDefinition_archive; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Ler;" ) - @Export("UnderlayDefinition_cached") - static EvictingDualNodeHashTable UnderlayDefinition_cached; + @Export("FloorUnderlayDefinition_cached") + static EvictingDualNodeHashTable FloorUnderlayDefinition_cached; @ObfuscatedName("q") @ObfuscatedGetter( intValue = -635678213 @@ -50,7 +50,7 @@ public class UnderlayDefinition extends DualNode { @Export("hueMultiplier") public int hueMultiplier; - UnderlayDefinition() { + FloorUnderlayDefinition() { this.rgb = 0; } @@ -59,8 +59,8 @@ public class UnderlayDefinition extends DualNode { signature = "(I)V", garbageValue = "-782326269" ) - @Export("init") - void init() { + @Export("postDecode") + void postDecode() { this.setHsl(this.rgb); } @@ -69,15 +69,15 @@ public class UnderlayDefinition extends DualNode { signature = "(Lgr;II)V", garbageValue = "-336010991" ) - @Export("read") - void read(Buffer var1, int var2) { + @Export("decode") + void decode(Buffer var1, int var2) { while (true) { int var3 = var1.readUnsignedByte(); if (var3 == 0) { return; } - this.readNext(var1, var3, var2); + this.decodeNext(var1, var3, var2); } } @@ -86,8 +86,8 @@ public class UnderlayDefinition extends DualNode { signature = "(Lgr;III)V", garbageValue = "137131494" ) - @Export("readNext") - void readNext(Buffer var1, int var2, int var3) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2, int var3) { if (var2 == 1) { this.rgb = var1.readMedium(); } @@ -100,10 +100,10 @@ public class UnderlayDefinition extends DualNode { garbageValue = "-107" ) @Export("setHsl") - void setHsl(int var1) { - double var2 = (double)(var1 >> 16 & 255) / 256.0D; - double var4 = (double)(var1 >> 8 & 255) / 256.0D; - double var6 = (double)(var1 & 255) / 256.0D; + void setHsl(int rgb) { + double var2 = (double)(rgb >> 16 & 255) / 256.0D; + double var4 = (double)(rgb >> 8 & 255) / 256.0D; + double var6 = (double)(rgb & 255) / 256.0D; double var8 = var2; if (var4 < var2) { var8 = var4; @@ -181,6 +181,6 @@ public class UnderlayDefinition extends DualNode { } static { - UnderlayDefinition_cached = new EvictingDualNodeHashTable(64); + FloorUnderlayDefinition_cached = new EvictingDualNodeHashTable(64); } } diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java index dfd20fe4b7..b942a26fd2 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -2,6 +2,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("kx") @Implements("FontName") @@ -56,9 +57,9 @@ public class FontName { ) @Export("calculateTag") public static long calculateTag(int x, int y, int type, boolean isNotInteractable, int identifier) { - long var5 = (long)((x & 0b1111111) << 0 | (y & 0b1111111) << 7 | (type & 0b11) << 14) | ((long)identifier & 0xffffffffL) << 17; + long var5 = (long)((x & 127) << 0 | (y & 127) << 7 | (type & 3) << 14) | ((long)identifier & 4294967295L) << 17; if (isNotInteractable) { - var5 |= 0x10000L; + var5 |= 65536L; } return var5; @@ -84,7 +85,7 @@ public class FontName { ) static final void method5638(String var0, int var1) { PacketBufferNode var2 = Interpreter.method1915(ClientPacket.field299, Client.packetWriter.isaacCipher); - var2.packetBuffer.writeByte(WorldMapRegion.method550(var0) + 1); + var2.packetBuffer.writeByte(WorldMapRegion.stringCp1252NullTerminatedByteSize(var0) + 1); var2.packetBuffer.writeStringCp1252NullTerminated(var0); var2.packetBuffer.writeByte(var1); Client.packetWriter.method241(var2); @@ -96,7 +97,7 @@ public class FontName { garbageValue = "-1336396061" ) static int method5639(int var0, Script var1, boolean var2) { - if (var0 == 3600) { + if (var0 == ScriptOpcodes.FRIEND_COUNT) { if (WorldMapArea.friendSystem.field357 == 0) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -2; } else if (WorldMapArea.friendSystem.field357 == 1) { @@ -108,28 +109,28 @@ public class FontName { return 1; } else { int var3; - if (var0 == 3601) { + if (var0 == ScriptOpcodes.FRIEND_GETNAME) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if (WorldMapArea.friendSystem.method99() && var3 >= 0 && var3 < WorldMapArea.friendSystem.friendsList.size()) { Friend var6 = (Friend)WorldMapArea.friendSystem.friendsList.get(var3); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.name(); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.previousName(); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.getName(); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.getPreviousName(); } else { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; } return 1; - } else if (var0 == 3602) { + } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if (WorldMapArea.friendSystem.method99() && var3 >= 0 && var3 < WorldMapArea.friendSystem.friendsList.size()) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ((Buddy)WorldMapArea.friendSystem.friendsList.get(var3)).world0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ((Buddy)WorldMapArea.friendSystem.friendsList.get(var3)).world; } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } return 1; - } else if (var0 == 3603) { + } else if (var0 == ScriptOpcodes.FRIEND_GETRANK) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if (WorldMapArea.friendSystem.method99() && var3 >= 0 && var3 < WorldMapArea.friendSystem.friendsList.size()) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ((Buddy)WorldMapArea.friendSystem.friendsList.get(var3)).rank; @@ -140,33 +141,33 @@ public class FontName { return 1; } else { String var4; - if (var0 == 3604) { + if (var0 == ScriptOpcodes.FRIEND_SETRANK) { var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; int var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; method5638(var4, var8); return 1; - } else if (var0 == 3605) { + } else if (var0 == ScriptOpcodes.FRIEND_ADD) { var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; WorldMapArea.friendSystem.addFriend(var4); return 1; - } else if (var0 == 3606) { + } else if (var0 == ScriptOpcodes.FRIEND_DEL) { var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; WorldMapArea.friendSystem.removeFriend(var4); return 1; - } else if (var0 == 3607) { + } else if (var0 == ScriptOpcodes.IGNORE_ADD) { var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - WorldMapArea.friendSystem.method105(var4); + WorldMapArea.friendSystem.addIgnore(var4); return 1; - } else if (var0 == 3608) { + } else if (var0 == ScriptOpcodes.IGNORE_DEL) { var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; WorldMapArea.friendSystem.removeIgnore(var4); return 1; - } else if (var0 == 3609) { + } else if (var0 == ScriptOpcodes.FRIEND_TEST) { var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var4 = NPCDefinition.method5161(var4); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapArea.friendSystem.isFriended(new Username(var4, KeyHandler.loginType), false) ? 1 : 0; return 1; - } else if (var0 == 3611) { + } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) { if (PacketWriter.clanChat != null) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = PacketWriter.clanChat.name; } else { @@ -174,7 +175,7 @@ public class FontName { } return 1; - } else if (var0 == 3612) { + } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) { if (PacketWriter.clanChat != null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = PacketWriter.clanChat.size(); } else { @@ -182,25 +183,25 @@ public class FontName { } return 1; - } else if (var0 == 3613) { + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if (PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size()) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = PacketWriter.clanChat.get(var3).username().getName(); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = PacketWriter.clanChat.get(var3).getUsername().getName(); } else { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; } return 1; - } else if (var0 == 3614) { + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if (PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size()) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ((Buddy)PacketWriter.clanChat.get(var3)).world(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ((Buddy)PacketWriter.clanChat.get(var3)).getWorld(); } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } return 1; - } else if (var0 == 3615) { + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if (PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size()) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ((Buddy)PacketWriter.clanChat.get(var3)).rank; @@ -209,24 +210,24 @@ public class FontName { } return 1; - } else if (var0 == 3616) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = PacketWriter.clanChat != null ? PacketWriter.clanChat.field96 : 0; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = PacketWriter.clanChat != null ? PacketWriter.clanChat.minKick : 0; return 1; - } else if (var0 == 3617) { + } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - IndexStoreActionHandler.method4655(var4); + ArchiveDiskActionHandler.clanKickUser(var4); return 1; - } else if (var0 == 3618) { + } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = PacketWriter.clanChat != null ? PacketWriter.clanChat.rank : 0; return 1; - } else if (var0 == 3619) { + } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) { var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; class31.method574(var4); return 1; - } else if (var0 == 3620) { - class12.method158(); + } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { + GrandExchangeOfferAgeComparator.method158(); return 1; - } else if (var0 == 3621) { + } else if (var0 == ScriptOpcodes.IGNORE_COUNT) { if (!WorldMapArea.friendSystem.method99()) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } else { @@ -234,33 +235,33 @@ public class FontName { } return 1; - } else if (var0 == 3622) { + } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if (WorldMapArea.friendSystem.method99() && var3 >= 0 && var3 < WorldMapArea.friendSystem.ignoreList.size()) { Ignored var7 = (Ignored)WorldMapArea.friendSystem.ignoreList.get(var3); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.name(); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.previousName(); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.getName(); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.getPreviousName(); } else { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; } return 1; - } else if (var0 == 3623) { + } else if (var0 == ScriptOpcodes.IGNORE_TEST) { var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var4 = NPCDefinition.method5161(var4); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapArea.friendSystem.isIgnored(new Username(var4, KeyHandler.loginType)) ? 1 : 0; return 1; - } else if (var0 == 3624) { + } else if (var0 == ScriptOpcodes.CLAN_ISSELF) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - if (PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size() && PacketWriter.clanChat.get(var3).username().equals(Canvas.localPlayer.username)) { + if (PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size() && PacketWriter.clanChat.get(var3).getUsername().equals(Canvas.localPlayer.username)) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1; } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } return 1; - } else if (var0 == 3625) { + } else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) { if (PacketWriter.clanChat != null && PacketWriter.clanChat.owner != null) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = PacketWriter.clanChat.owner; } else { @@ -268,7 +269,7 @@ public class FontName { } return 1; - } else if (var0 == 3626) { + } else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if (PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size() && ((ClanMate)PacketWriter.clanChat.get(var3)).isFriend()) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1; @@ -277,7 +278,7 @@ public class FontName { } return 1; - } else if (var0 != 3627) { + } else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) { if (var0 == 3628) { WorldMapArea.friendSystem.friendsList.removeComparator(); return 1; @@ -424,12 +425,12 @@ public class FontName { return 1; } else if (var0 == 3656) { var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - WorldMapArea.friendSystem.friendsList.addComparator(new class157(var5)); + WorldMapArea.friendSystem.friendsList.addComparator(new BuddyRankComparator(var5)); return 1; } else if (var0 == 3657) { var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; if (PacketWriter.clanChat != null) { - PacketWriter.clanChat.addComparator(new class157(var5)); + PacketWriter.clanChat.addComparator(new BuddyRankComparator(var5)); } return 1; @@ -470,25 +471,25 @@ public class FontName { VarpDefinition.VarpDefinition_cached.clear(); GrandExchangeEvents.method69(); Buffer.clearHealthbarCaches(); - StructDefinition.field886.clear(); + StructDefinition.StructDefinition_cached.clear(); InvDefinition.method4754(); Projectile.method2089(); PlayerAppearance.PlayerAppearance_cachedModels.clear(); - class157.method3382(); + BuddyRankComparator.method3382(); ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); Script.Script_cached.clear(); - AbstractIndexCache.indexCache0.method8(); - Skeleton.indexCache1.method8(); - WorldMapIcon1.indexCache3.method8(); - WorldMapDecoration.indexCache4.method8(); - SecureRandomFuture.indexCache5.method8(); - UserComparator3.indexCache6.method8(); - class40.indexCache7.method8(); - WorldMapSection3.indexCache8.method8(); - class238.indexCache9.method8(); - class16.indexCache10.method8(); - Login.indexCache11.method8(); - Formatting.indexCache12.method8(); + AbstractArchive.archive0.method8(); + Skeleton.archive1.method8(); + WorldMapIcon1.archive3.method8(); + WorldMapDecoration.archive4.method8(); + SecureRandomFuture.archive5.method8(); + UserComparator3.archive6.method8(); + class40.archive7.method8(); + WorldMapSection3.archive8.method8(); + class238.archive9.method8(); + class16.archive10.method8(); + Login.archive11.method8(); + Formatting.archive12.method8(); } @ObfuscatedName("gg") @@ -497,16 +498,16 @@ public class FontName { garbageValue = "-2003105831" ) @Export("setViewportShape") - static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) { - if (var2 < 1) { - var2 = 1; + static final void setViewportShape(int x, int y, int width, int height, boolean clear) { + if (width < 1) { + width = 1; } - if (var3 < 1) { - var3 = 1; + if (height < 1) { + height = 1; } - int var5 = var3 - 334; + int var5 = height - 334; int var6; if (var5 < 0) { var6 = Client.field130; @@ -516,53 +517,53 @@ public class FontName { var6 = (Client.field131 - Client.field130) * var5 / 100 + Client.field130; } - int var7 = var3 * var6 * 512 / (var2 * 334); + int var7 = height * var6 * 512 / (width * 334); int var8; int var9; short var10; if (var7 < Client.field132) { var10 = Client.field132; - var6 = var10 * var2 * 334 / (var3 * 512); + var6 = var10 * width * 334 / (height * 512); if (var6 > Client.field134) { var6 = Client.field134; - var8 = var3 * var6 * 512 / (var10 * 334); - var9 = (var2 - var8) / 2; - if (var4) { + var8 = height * var6 * 512 / (var10 * 334); + var9 = (width - var8) / 2; + if (clear) { Rasterizer2D.Rasterizer2D_resetClip(); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); - Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); + Rasterizer2D.Rasterizer2D_fillRectangle(x, y, var9, height, -16777216); + Rasterizer2D.Rasterizer2D_fillRectangle(x + width - var9, y, var9, height, -16777216); } - var0 += var9; - var2 -= var9 * 2; + x += var9; + width -= var9 * 2; } } else if (var7 > Client.field133) { var10 = Client.field133; - var6 = var10 * var2 * 334 / (var3 * 512); + var6 = var10 * width * 334 / (height * 512); if (var6 < Client.field135) { var6 = Client.field135; - var8 = var10 * var2 * 334 / (var6 * 512); - var9 = (var3 - var8) / 2; - if (var4) { + var8 = var10 * width * 334 / (var6 * 512); + var9 = (height - var8) / 2; + if (clear) { Rasterizer2D.Rasterizer2D_resetClip(); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); + Rasterizer2D.Rasterizer2D_fillRectangle(x, y, width, var9, -16777216); + Rasterizer2D.Rasterizer2D_fillRectangle(x, height + y - var9, width, var9, -16777216); } - var1 += var9; - var3 -= var9 * 2; + y += var9; + height -= var9 * 2; } } - Client.viewportZoom = var3 * var6 / 334; - if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { - ScriptEvent.method1183(var2, var3); + Client.viewportZoom = height * var6 / 334; + if (width != Client.viewportWidth || height != Client.viewportHeight) { + ScriptEvent.method1183(width, height); } - Client.viewportOffsetX = var0; - Client.viewportOffsetY = var1; - Client.viewportWidth = var2; - Client.viewportHeight = var3; + Client.viewportOffsetX = x; + Client.viewportOffsetY = y; + Client.viewportWidth = width; + Client.viewportHeight = height; } @ObfuscatedName("km") diff --git a/runescape-client/src/main/java/Fonts.java b/runescape-client/src/main/java/Fonts.java index dd41db27c5..81cb67cf78 100644 --- a/runescape-client/src/main/java/Fonts.java +++ b/runescape-client/src/main/java/Fonts.java @@ -11,8 +11,8 @@ public class Fonts { @ObfuscatedSignature( signature = "Lff;" ) - @Export("indexStore255") - static IndexStore indexStore255; + @Export("masterDisk") + static ArchiveDisk masterDisk; @ObfuscatedName("o") static byte[][][] field350; @ObfuscatedName("l") @@ -25,12 +25,12 @@ public class Fonts { @ObfuscatedSignature( signature = "Lir;" ) - AbstractIndexCache field351; + AbstractArchive field351; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lir;" ) - AbstractIndexCache field352; + AbstractArchive field352; @ObfuscatedName("q") @Export("map") HashMap map; @@ -38,7 +38,7 @@ public class Fonts { @ObfuscatedSignature( signature = "(Lir;Lir;)V" ) - public Fonts(AbstractIndexCache var1, AbstractIndexCache var2) { + public Fonts(AbstractArchive var1, AbstractArchive var2) { this.field351 = var1; this.field352 = var2; this.map = new HashMap(); @@ -59,12 +59,12 @@ public class Fonts { if (this.map.containsKey(var5)) { var2.put(var5, this.map.get(var5)); } else { - AbstractIndexCache var6 = this.field351; - AbstractIndexCache var7 = this.field352; + AbstractArchive var6 = this.field351; + AbstractArchive var7 = this.field352; String var8 = var5.field349; - int var9 = var6.getArchiveId(var8); - int var10 = var6.getRecordId(var9, ""); - Font var11 = SpriteIds.method5823(var6, var7, var9, var10); + int var9 = var6.getGroupId(var8); + int var10 = var6.getFileId(var9, ""); + Font var11 = GraphicsDefaults.method5823(var6, var7, var9, var10); if (var11 != null) { this.map.put(var5, var11); var2.put(var5, var11); diff --git a/runescape-client/src/main/java/Formatting.java b/runescape-client/src/main/java/Formatting.java index 789f058734..e70709cc5a 100644 --- a/runescape-client/src/main/java/Formatting.java +++ b/runescape-client/src/main/java/Formatting.java @@ -2,6 +2,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("cy") @Implements("Formatting") @@ -12,8 +13,8 @@ public class Formatting { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache12") - static IndexCache indexCache12; + @Export("archive12") + static Archive archive12; @ObfuscatedName("s") @ObfuscatedSignature( @@ -21,11 +22,11 @@ public class Formatting { garbageValue = "1654486766" ) static int method2023(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111; - if (var0 == 1700) { + Widget var3 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111; + if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.itemId; return 1; - } else if (var0 == 1701) { + } else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { if (var3.itemId != -1) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.itemQuantity; } else { @@ -33,7 +34,7 @@ public class Formatting { } return 1; - } else if (var0 == 1702) { + } else if (var0 == ScriptOpcodes.CC_GETID) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.childIndex; return 1; } else { @@ -50,33 +51,33 @@ public class Formatting { int var3; int var4; int var5; - EnumDefinition var9; - if (var0 == 3400) { + EnumDefinition var6; + if (var0 == ScriptOpcodes.ENUM_STRING) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; - var9 = Interpreter.getEnum(var3); - if (var9.valType != 's') { + var6 = Interpreter.getEnum(var3); + if (var6.outputType != 's') { } - for (var5 = 0; var5 < var9.size0; ++var5) { - if (var4 == var9.keys[var5]) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.stringVals[var5]; - var9 = null; + for (var5 = 0; var5 < var6.outputCount; ++var5) { + if (var4 == var6.keys[var5]) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.strVals[var5]; + var6 = null; break; } } - if (var9 != null) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.defaultString; + if (var6 != null) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.defaultStr; } return 1; - } else if (var0 != 3408) { - if (var0 == 3411) { + } else if (var0 != ScriptOpcodes.ENUM) { + if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - var9 = Interpreter.getEnum(var3); - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var9.size(); + var6 = Interpreter.getEnum(var3); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.size(); return 1; } else { return 2; @@ -85,28 +86,28 @@ public class Formatting { RouteStrategy.Interpreter_intStackSize -= 4; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; - int var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; + int var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3]; - EnumDefinition var7 = Interpreter.getEnum(var6); - if (var3 == var7.keyType && var4 == var7.valType) { - for (int var8 = 0; var8 < var7.size0; ++var8) { - if (var5 == var7.keys[var8]) { + EnumDefinition var8 = Interpreter.getEnum(var7); + if (var3 == var8.inputType && var4 == var8.outputType) { + for (int var9 = 0; var9 < var8.outputCount; ++var9) { + if (var5 == var8.keys[var9]) { if (var4 == 115) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.stringVals[var8]; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.strVals[var9]; } else { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var7.intVals[var8]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var8.intVals[var9]; } - var7 = null; + var8 = null; break; } } - if (var7 != null) { + if (var8 != null) { if (var4 == 115) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.defaultString; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.defaultStr; } else { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var7.defaultInt; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var8.defaultInt; } } diff --git a/runescape-client/src/main/java/Frames.java b/runescape-client/src/main/java/Frames.java index 434c8880c6..3cb846b185 100644 --- a/runescape-client/src/main/java/Frames.java +++ b/runescape-client/src/main/java/Frames.java @@ -7,8 +7,8 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Frames") public class Frames extends DualNode { @ObfuscatedName("o") - @Export("IndexStoreActionHandler_thread") - static Thread IndexStoreActionHandler_thread; + @Export("ArchiveDiskActionHandler_thread") + static Thread ArchiveDiskActionHandler_thread; @ObfuscatedName("bc") @ObfuscatedSignature( signature = "[Llq;" @@ -26,14 +26,14 @@ public class Frames extends DualNode { signature = "(Lir;Lir;IZ)V", garbageValue = "0" ) - public Frames(AbstractIndexCache var1, AbstractIndexCache var2, int var3, boolean var4) { + public Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { NodeDeque var5 = new NodeDeque(); int var6 = var1.method4(var3); this.frames = new Animation[var6]; int[] var7 = var1.method3(var3); for (int var8 = 0; var8 < var7.length; ++var8) { - byte[] var9 = var1.takeRecord(var3, var7[var8]); + byte[] var9 = var1.takeFile(var3, var7[var8]); Skeleton var10 = null; int var11 = (var9[0] & 255) << 8 | var9[1] & 255; @@ -45,7 +45,7 @@ public class Frames extends DualNode { } if (var10 == null) { - byte[] var13 = var2.getRecord(var11, 0); + byte[] var13 = var2.getFile(var11, 0); var10 = new Skeleton(var11, var13); var5.addFirst(var10); } @@ -61,8 +61,8 @@ public class Frames extends DualNode { garbageValue = "-1018278334" ) @Export("hasAlphaTransform") - public boolean hasAlphaTransform(int var1) { - return this.frames[var1].hasAlphaTransform; + public boolean hasAlphaTransform(int frame) { + return this.frames[frame].hasAlphaTransform; } @ObfuscatedName("m") @@ -70,7 +70,7 @@ public class Frames extends DualNode { signature = "(Lir;I)V", garbageValue = "1204337492" ) - public static void method3241(AbstractIndexCache var0) { + public static void method3241(AbstractArchive var0) { VarcInt.field942 = var0; } diff --git a/runescape-client/src/main/java/Friend.java b/runescape-client/src/main/java/Friend.java index af3960acfd..4203d642d2 100644 --- a/runescape-client/src/main/java/Friend.java +++ b/runescape-client/src/main/java/Friend.java @@ -20,9 +20,9 @@ public class Friend extends Buddy { signature = "(Lkq;I)I", garbageValue = "-1559116693" ) - @Export("compareTo00") - int compareTo00(Friend var1) { - return super.world0 == Client.worldId && Client.worldId != var1.world0 ? -1 : (Client.worldId == var1.world0 && super.world0 != Client.worldId ? 1 : (super.world0 != 0 && var1.world0 == 0 ? -1 : (var1.world0 != 0 && super.world0 == 0 ? 1 : (this.field354 && !var1.field354 ? -1 : (!this.field354 && var1.field354 ? 1 : (this.field355 && !var1.field355 ? -1 : (!this.field355 && var1.field355 ? 1 : (super.world0 != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2)))))))); + @Export("compareToFriend") + int compareToFriend(Friend other) { + return super.world == Client.worldId && Client.worldId != other.world ? -1 : (Client.worldId == other.world && super.world != Client.worldId ? 1 : (super.world != 0 && other.world == 0 ? -1 : (other.world != 0 && super.world == 0 ? 1 : (this.field354 && !other.field354 ? -1 : (!this.field354 && other.field354 ? 1 : (this.field355 && !other.field355 ? -1 : (!this.field355 && other.field355 ? 1 : (super.world != 0 ? super.int2 - other.int2 : other.int2 - super.int2)))))))); } @ObfuscatedName("aj") @@ -30,12 +30,12 @@ public class Friend extends Buddy { signature = "(Ljs;I)I", garbageValue = "1627362569" ) - public int compareTo0(User var1) { - return this.compareTo00((Friend)var1); + @Export("compareToUser") + public int compareToUser(User var1) { + return this.compareToFriend((Friend)var1); } - @ObfuscatedName("compareTo") public int compareTo(Object var1) { - return this.compareTo00((Friend)var1); + return this.compareToFriend((Friend)var1); } } diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java index 558beec2ba..c4d48244db 100644 --- a/runescape-client/src/main/java/FriendSystem.java +++ b/runescape-client/src/main/java/FriendSystem.java @@ -3,6 +3,7 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("bh") @Implements("FriendSystem") @@ -79,11 +80,11 @@ public class FriendSystem { for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { if ((long)var1.time < class203.currentTimeMs() / 1000L - 5L) { if (var1.world > 0) { - WorldMapIcon1.method219(5, "", var1.username + " has logged in."); + WorldMapIcon1.addGameMessage(5, "", var1.username + " has logged in."); } if (var1.world == 0) { - WorldMapIcon1.method219(5, "", var1.username + " has logged out."); + WorldMapIcon1.addGameMessage(5, "", var1.username + " has logged out."); } var1.remove(); @@ -136,31 +137,31 @@ public class FriendSystem { if (var2.hasCleanName()) { StringBuilder var3; String var4; - if (this.method104()) { + if (this.canAddFriend()) { var3 = null; var4 = "Your friend list is full. Max of 200 for free users, and 400 for members"; - WorldMapIcon1.method219(30, "", var4); + WorldMapIcon1.addGameMessage(30, "", var4); } else if (Canvas.localPlayer.username.equals(var2)) { var3 = null; var4 = "You can't add yourself to your own friend list"; - WorldMapIcon1.method219(30, "", var4); + WorldMapIcon1.addGameMessage(30, "", var4); } else { Object var5; if (this.isFriended(var2, false)) { var3 = (new StringBuilder()).append(var1); var5 = null; var4 = var3.append(" is already on your friend list").toString(); - WorldMapIcon1.method219(30, "", var4); + WorldMapIcon1.addGameMessage(30, "", var4); } else if (this.isIgnored(var2)) { var3 = new StringBuilder(); var5 = null; var3 = var3.append("Please remove ").append(var1); var5 = null; var4 = var3.append(" from your ignore list first").toString(); - WorldMapIcon1.method219(30, "", var4); + WorldMapIcon1.addGameMessage(30, "", var4); } else { PacketBufferNode var6 = Interpreter.method1915(ClientPacket.field310, Client.packetWriter.isaacCipher); - var6.packetBuffer.writeByte(WorldMapRegion.method550(var1)); + var6.packetBuffer.writeByte(WorldMapRegion.stringCp1252NullTerminatedByteSize(var1)); var6.packetBuffer.writeStringCp1252NullTerminated(var1); Client.packetWriter.method241(var6); } @@ -175,7 +176,8 @@ public class FriendSystem { signature = "(B)Z", garbageValue = "57" ) - final boolean method104() { + @Export("canAddFriend") + final boolean canAddFriend() { return this.friendsList.isFull() || this.friendsList.size() >= 200 && Client.field209 != 1; } @@ -184,20 +186,21 @@ public class FriendSystem { signature = "(Ljava/lang/String;B)V", garbageValue = "30" ) - final void method105(String var1) { + @Export("addIgnore") + final void addIgnore(String var1) { if (var1 != null) { Username var2 = new Username(var1, this.loginType); if (var2.hasCleanName()) { StringBuilder var3; String var4; - if (this.method106()) { + if (this.canAddIgnore()) { var3 = null; var4 = "Your ignore list is full. Max of 100 for free users, and 400 for members"; - WorldMapIcon1.method219(30, "", var4); + WorldMapIcon1.addGameMessage(30, "", var4); } else if (Canvas.localPlayer.username.equals(var2)) { var3 = null; var4 = "You can't add yourself to your own ignore list"; - WorldMapIcon1.method219(30, "", var4); + WorldMapIcon1.addGameMessage(30, "", var4); } else if (this.isIgnored(var2)) { class22.method294(var1); } else { @@ -208,10 +211,10 @@ public class FriendSystem { var3 = var3.append("Please remove ").append(var1); var5 = null; var4 = var3.append(" from your friend list first").toString(); - WorldMapIcon1.method219(30, "", var4); + WorldMapIcon1.addGameMessage(30, "", var4); } else { var5 = Interpreter.method1915(ClientPacket.field312, Client.packetWriter.isaacCipher); - var5.packetBuffer.writeByte(WorldMapRegion.method550(var1)); + var5.packetBuffer.writeByte(WorldMapRegion.stringCp1252NullTerminatedByteSize(var1)); var5.packetBuffer.writeStringCp1252NullTerminated(var1); Client.packetWriter.method241(var5); } @@ -226,7 +229,8 @@ public class FriendSystem { signature = "(B)Z", garbageValue = "120" ) - final boolean method106() { + @Export("canAddIgnore") + final boolean canAddIgnore() { return this.ignoreList.isFull() || this.ignoreList.size() >= 100 && Client.field209 != 1; } @@ -236,15 +240,15 @@ public class FriendSystem { garbageValue = "-2122207917" ) @Export("removeFriend") - final void removeFriend(String var1) { - if (var1 != null) { - Username var2 = new Username(var1, this.loginType); + final void removeFriend(String name) { + if (name != null) { + Username var2 = new Username(name, this.loginType); if (var2.hasCleanName()) { if (this.friendsList.removeByUsername(var2)) { WorldMapManager.method668(); PacketBufferNode var3 = Interpreter.method1915(ClientPacket.field276, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(WorldMapRegion.method550(var1)); - var3.packetBuffer.writeStringCp1252NullTerminated(var1); + var3.packetBuffer.writeByte(WorldMapRegion.stringCp1252NullTerminatedByteSize(name)); + var3.packetBuffer.writeStringCp1252NullTerminated(name); Client.packetWriter.method241(var3); } @@ -260,15 +264,15 @@ public class FriendSystem { garbageValue = "-1673636127" ) @Export("removeIgnore") - final void removeIgnore(String var1) { - if (var1 != null) { - Username var2 = new Username(var1, this.loginType); + final void removeIgnore(String name) { + if (name != null) { + Username var2 = new Username(name, this.loginType); if (var2.hasCleanName()) { if (this.ignoreList.removeByUsername(var2)) { WorldMapManager.method668(); PacketBufferNode var3 = Interpreter.method1915(ClientPacket.field250, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(WorldMapRegion.method550(var1)); - var3.packetBuffer.writeStringCp1252NullTerminated(var1); + var3.packetBuffer.writeByte(WorldMapRegion.stringCp1252NullTerminatedByteSize(name)); + var3.packetBuffer.writeStringCp1252NullTerminated(name); Client.packetWriter.method241(var3); } @@ -300,18 +304,18 @@ public class FriendSystem { var0 -= 1000; var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); } else { - var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111; + var3 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111; } - if (var0 == 1927) { + if (var0 == ScriptOpcodes.CC_CALLONRESIZE) { if (Interpreter.field425 >= 10) { throw new RuntimeException(); - } else if (var3.field975 == null) { + } else if (var3.onResize == null) { return 0; } else { ScriptEvent var4 = new ScriptEvent(); var4.widget = var3; - var4.args0 = var3.field975; + var4.args0 = var3.onResize; var4.field772 = Interpreter.field425 + 1; Client.scriptEvents.addFirst(var4); return 1; @@ -328,6 +332,6 @@ public class FriendSystem { ) @Export("jmodCheck") public static boolean jmodCheck() { - return Client.rights >= 2; + return Client.staffModLevel >= 2; } } diff --git a/runescape-client/src/main/java/FriendsList.java b/runescape-client/src/main/java/FriendsList.java index 36110033cc..c9fbb3601f 100644 --- a/runescape-client/src/main/java/FriendsList.java +++ b/runescape-client/src/main/java/FriendsList.java @@ -63,7 +63,7 @@ public class FriendsList extends UserList { @Export("isFriended") public boolean isFriended(Username var1, boolean var2) { Friend var3 = (Friend)this.getByUsername(var1); - return var3 != null && (!var2 || var3.world0 != 0); + return var3 != null && (!var2 || var3.world != 0); } @ObfuscatedName("x") @@ -72,24 +72,24 @@ public class FriendsList extends UserList { garbageValue = "-11" ) @Export("read") - public void read(Buffer var1, int var2) { + public void read(Buffer buffer, int var2) { while (true) { - if (var1.index < var2) { - boolean var3 = var1.readUnsignedByte() == 1; - Username var4 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); - Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); - int var6 = var1.readUnsignedShort(); - int var7 = var1.readUnsignedByte(); - int var8 = var1.readUnsignedByte(); + if (buffer.index < var2) { + boolean var3 = buffer.readUnsignedByte() == 1; + Username var4 = new Username(buffer.readStringCp1252NullTerminated(), this.loginType); + Username var5 = new Username(buffer.readStringCp1252NullTerminated(), this.loginType); + int var6 = buffer.readUnsignedShort(); + int var7 = buffer.readUnsignedByte(); + int var8 = buffer.readUnsignedByte(); boolean var9 = (var8 & 2) != 0; boolean var10 = (var8 & 1) != 0; if (var6 > 0) { - var1.readStringCp1252NullTerminated(); - var1.readUnsignedByte(); - var1.readInt(); + buffer.readStringCp1252NullTerminated(); + buffer.readUnsignedByte(); + buffer.readInt(); } - var1.readStringCp1252NullTerminated(); + buffer.readStringCp1252NullTerminated(); if (var4 != null && var4.hasCleanName()) { Friend var11 = (Friend)this.getByCurrentUsername(var4); if (var3) { @@ -105,7 +105,7 @@ public class FriendsList extends UserList { if (var11 != null) { this.changeName(var11, var4, var5); - if (var6 != var11.world0) { + if (var6 != var11.world) { boolean var14 = true; for (FriendLoginUpdate var13 = (FriendLoginUpdate)this.friendLoginUpdates.last(); var13 != null; var13 = (FriendLoginUpdate)this.friendLoginUpdates.previous()) { @@ -132,13 +132,13 @@ public class FriendsList extends UserList { var11 = (Friend)this.addLast(var4, var5); } - if (var6 != var11.world0) { + if (var6 != var11.world) { var11.int2 = ++this.field358 - 1; - if (var11.world0 == -1 && var6 == 0) { + if (var11.world == -1 && var6 == 0) { var11.int2 = -(var11.int2 * -1377538447) * 120689297; } - var11.world0 = var6; + var11.world = var6; } var11.rank = var7; diff --git a/runescape-client/src/main/java/GameShell.java b/runescape-client/src/main/java/GameShell.java index 371bfe564f..4ca3e00005 100644 --- a/runescape-client/src/main/java/GameShell.java +++ b/runescape-client/src/main/java/GameShell.java @@ -469,7 +469,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene garbageValue = "559367680" ) @Export("startThread") - protected final void startThread(int var1, int var2, int var3) { + protected final void startThread(int width, int height, int revision) { try { if (gameShell != null) { ++field361; @@ -483,9 +483,9 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } gameShell = this; - SoundCache.canvasWidth = var1; - Huffman.canvasHeight = var2; - RunException.revision = var3; + SoundCache.canvasWidth = width; + Huffman.canvasHeight = height; + RunException.revision = revision; RunException.applet = this; if (taskHandler == null) { taskHandler = new TaskHandler(); @@ -598,7 +598,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene class230.field1138 = hasFocus; } - this.vmethod112(); + this.doCycle(); } @ObfuscatedName("ar") @@ -635,7 +635,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } this.method110(); - this.methodDraw(this.field369); + this.draw(this.field369); if (this.field369) { this.clearBackground(); } @@ -718,15 +718,16 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene signature = "(I)V", garbageValue = "1445885427" ) - protected abstract void vmethod112(); + @Export("doCycle") + protected abstract void doCycle(); @ObfuscatedName("ab") @ObfuscatedSignature( signature = "(ZI)V", garbageValue = "106302203" ) - @Export("methodDraw") - protected abstract void methodDraw(boolean var1); + @Export("draw") + protected abstract void draw(boolean var1); @ObfuscatedName("ae") @ObfuscatedSignature( @@ -809,13 +810,13 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene garbageValue = "39" ) @Export("error") - protected void error(String var1) { + protected void error(String type) { if (!this.hasErrored) { this.hasErrored = true; - System.out.println("error_game_" + var1); + System.out.println("error_game_" + type); try { - this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + var1 + ".ws"), "_self"); + this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + type + ".ws"), "_self"); } catch (Exception var3) { } } @@ -868,8 +869,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene ) protected abstract void vmethod114(); - @ObfuscatedName("destroy") - public final void method115() { + public final void destroy() { if (this == gameShell && !isKilled) { stopTimeMs = class203.currentTimeMs(); class203.method4010(5000L); @@ -878,8 +878,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } - @Export("paint") - @ObfuscatedName("paint") public final synchronized void paint(Graphics var1) { if (this == gameShell && !isKilled) { this.field369 = true; @@ -893,8 +891,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } - @Export("run") - @ObfuscatedName("run") public void run() { try { if (TaskHandler.javaVendor != null) { @@ -908,7 +904,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene if (var2.startsWith("1.6.0_")) { int var3; - for (var3 = 6; var3 < var2.length() && class159.method3394(var2.charAt(var3)); ++var3) { + for (var3 = 6; var3 < var2.length() && class159.isCharDigit(var2.charAt(var3)); ++var3) { } String var4 = var2.substring(6, var3); @@ -953,76 +949,53 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.kill(); } - @ObfuscatedName("start") - public final void method116() { + public final void start() { if (this == gameShell && !isKilled) { stopTimeMs = 0L; } } - @Export("update") - @ObfuscatedName("update") public final void update(Graphics var1) { this.paint(var1); } - @Export("focusGained") - @ObfuscatedName("focusGained") public final void focusGained(FocusEvent var1) { hasFocus = true; this.field369 = true; } - @Export("windowActivated") - @ObfuscatedName("windowActivated") public final void windowActivated(WindowEvent var1) { } - @Export("windowClosed") - @ObfuscatedName("windowClosed") public final void windowClosed(WindowEvent var1) { } - @Export("windowClosing") - @ObfuscatedName("windowClosing") public final void windowClosing(WindowEvent var1) { - this.method115(); + this.destroy(); } - @Export("windowDeiconified") - @ObfuscatedName("windowDeiconified") public final void windowDeiconified(WindowEvent var1) { } - @Export("windowOpened") - @ObfuscatedName("windowOpened") public final void windowOpened(WindowEvent var1) { } - @ObfuscatedName("init") - public abstract void vmethod117(); + public abstract void init(); - @ObfuscatedName("stop") - public final void method118() { + public final void stop() { if (this == gameShell && !isKilled) { stopTimeMs = class203.currentTimeMs() + 4000L; } } - @Export("windowIconified") - @ObfuscatedName("windowIconified") public final void windowIconified(WindowEvent var1) { } - @Export("windowDeactivated") - @ObfuscatedName("windowDeactivated") public final void windowDeactivated(WindowEvent var1) { } - @Export("focusLost") - @ObfuscatedName("focusLost") public final void focusLost(FocusEvent var1) { hasFocus = false; } @@ -1033,23 +1006,23 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene garbageValue = "17" ) @Export("updateGameState") - static void updateGameState(int var0) { - if (var0 != Client.gameState) { + static void updateGameState(int gameState) { + if (gameState != Client.gameState) { if (Client.gameState == 0) { TextureProvider.client.method113(); } - if (var0 == 20 || var0 == 40 || var0 == 45) { + if (gameState == 20 || gameState == 40 || gameState == 45) { Client.loginState = 0; Client.field168 = 0; Client.field169 = 0; - Client.timer.method331(var0); - if (var0 != 20) { + Client.timer.method331(gameState); + if (gameState != 20) { class15.method184(false); } } - if (var0 != 20 && var0 != 40 && ClientParameter.field341 != null) { + if (gameState != 20 && gameState != 40 && ClientParameter.field341 != null) { ClientParameter.field341.close(); ClientParameter.field341 = null; } @@ -1062,19 +1035,19 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene Client.field180 = 1; } - if (var0 != 5 && var0 != 10) { - if (var0 == 20) { - class2.method27(class16.indexCache10, WorldMapSection3.indexCache8, true, Client.gameState == 11 ? 4 : 0); - } else if (var0 == 11) { - class2.method27(class16.indexCache10, WorldMapSection3.indexCache8, false, 4); + if (gameState != 5 && gameState != 10) { + if (gameState == 20) { + class2.method27(class16.archive10, WorldMapSection3.archive8, true, Client.gameState == 11 ? 4 : 0); + } else if (gameState == 11) { + class2.method27(class16.archive10, WorldMapSection3.archive8, false, 4); } else { class80.method2015(); } } else { - class2.method27(class16.indexCache10, WorldMapSection3.indexCache8, true, 0); + class2.method27(class16.archive10, WorldMapSection3.archive8, true, 0); } - Client.gameState = var0; + Client.gameState = gameState; } } diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java index c4665c6534..14ad28bf74 100644 --- a/runescape-client/src/main/java/GrandExchangeEvent.java +++ b/runescape-client/src/main/java/GrandExchangeEvent.java @@ -3,6 +3,7 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("l") @Implements("GrandExchangeEvent") @@ -25,18 +26,18 @@ public class GrandExchangeEvent { @Export("grandExchangeOffer") public final GrandExchangeOffer grandExchangeOffer; @ObfuscatedName("w") - @Export("string1") - String string1; + @Export("offerName") + String offerName; @ObfuscatedName("o") - @Export("string2") - String string2; + @Export("previousOfferName") + String previousOfferName; @ObfuscatedSignature( signature = "(Lgr;BI)V" ) GrandExchangeEvent(Buffer var1, byte var2, int var3) { - this.string1 = var1.readStringCp1252NullTerminated(); - this.string2 = var1.readStringCp1252NullTerminated(); + this.offerName = var1.readStringCp1252NullTerminated(); + this.previousOfferName = var1.readStringCp1252NullTerminated(); this.world = var1.readUnsignedShort(); this.field370 = var1.readLong(); int var4 = var1.readInt(); @@ -56,8 +57,9 @@ public class GrandExchangeEvent { signature = "(I)Ljava/lang/String;", garbageValue = "1672323214" ) - public String method119() { - return this.string1; + @Export("getOfferName") + public String getOfferName() { + return this.offerName; } @ObfuscatedName("f") @@ -65,8 +67,9 @@ public class GrandExchangeEvent { signature = "(I)Ljava/lang/String;", garbageValue = "-271438207" ) - public String method120() { - return this.string2; + @Export("getPreviousOfferName") + public String getPreviousOfferName() { + return this.previousOfferName; } @ObfuscatedName("f") @@ -75,14 +78,14 @@ public class GrandExchangeEvent { garbageValue = "-1003049523" ) @Export("runScript0") - static void runScript0(ScriptEvent var0, int var1) { - Object[] var2 = var0.args0; + static void runScript0(ScriptEvent scriptEvent, int var1) { + Object[] var2 = scriptEvent.args0; Script var3; int var4; - if (class12.method162(var0.type0)) { + if (GrandExchangeOfferAgeComparator.method162(scriptEvent.type0)) { class15.worldMapEvent = (WorldMapEvent)var2[0]; WorldMapElement var5 = ViewportMouse.getWorldMapElement(class15.worldMapEvent.mapElement); - var3 = FaceNormal.method3236(var0.type0, var5.field1020, var5.category); + var3 = FaceNormal.method3236(scriptEvent.type0, var5.field1020, var5.category); } else { var4 = (Integer)var2[0]; var3 = SoundSystem.method2451(var4); @@ -112,46 +115,46 @@ public class GrandExchangeEvent { if (var2[var8] instanceof Integer) { var11 = (Integer)var2[var8]; if (var11 == -2147483647) { - var11 = var0.mouseX; + var11 = scriptEvent.mouseX; } if (var11 == -2147483646) { - var11 = var0.mouseY; + var11 = scriptEvent.mouseY; } if (var11 == -2147483645) { - var11 = var0.widget != null ? var0.widget.id : -1; + var11 = scriptEvent.widget != null ? scriptEvent.widget.id : -1; } if (var11 == -2147483644) { - var11 = var0.opIndex; + var11 = scriptEvent.opIndex; } if (var11 == -2147483643) { - var11 = var0.widget != null ? var0.widget.childIndex : -1; + var11 = scriptEvent.widget != null ? scriptEvent.widget.childIndex : -1; } if (var11 == -2147483642) { - var11 = var0.dragTarget != null ? var0.dragTarget.id : -1; + var11 = scriptEvent.dragTarget != null ? scriptEvent.dragTarget.id : -1; } if (var11 == -2147483641) { - var11 = var0.dragTarget != null ? var0.dragTarget.childIndex : -1; + var11 = scriptEvent.dragTarget != null ? scriptEvent.dragTarget.childIndex : -1; } if (var11 == -2147483640) { - var11 = var0.keyTyped; + var11 = scriptEvent.keyTyped; } if (var11 == -2147483639) { - var11 = var0.keyPressed; + var11 = scriptEvent.keyPressed; } Username.Interpreter_intLocals[var9++] = var11; } else if (var2[var8] instanceof String) { var12 = (String)var2[var8]; if (var12.equals("event_opbase")) { - var12 = var0.targetName; + var12 = scriptEvent.targetName; } Interpreter.Interpreter_stringLocals[var26++] = var12; @@ -159,7 +162,7 @@ public class GrandExchangeEvent { } var8 = 0; - Interpreter.field425 = var0.field772; + Interpreter.field425 = scriptEvent.field772; while (true) { ++var8; @@ -190,38 +193,38 @@ public class GrandExchangeEvent { } } else if (var13 == 0) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6[var4]; - } else if (var13 == 1) { + } else if (var13 == ScriptOpcodes.GET_VARP) { var11 = var6[var4]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Varps.Varps_main[var11]; - } else if (var13 == 2) { + } else if (var13 == ScriptOpcodes.SET_VARP) { var11 = var6[var4]; Varps.Varps_main[var11] = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - IndexCache.method4703(var11); - } else if (var13 == 3) { + Archive.method4703(var11); + } else if (var13 == ScriptOpcodes.SCONST) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.stringOperands[var4]; - } else if (var13 == 6) { + } else if (var13 == ScriptOpcodes.JUMP) { var4 += var6[var4]; - } else if (var13 == 7) { + } else if (var13 == ScriptOpcodes.IF_ICMPNE) { RouteStrategy.Interpreter_intStackSize -= 2; if (Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) { var4 += var6[var4]; } - } else if (var13 == 8) { + } else if (var13 == ScriptOpcodes.IF_ICMPEQ) { RouteStrategy.Interpreter_intStackSize -= 2; if (Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) { var4 += var6[var4]; } - } else if (var13 == 9) { + } else if (var13 == ScriptOpcodes.IF_ICMPLT) { RouteStrategy.Interpreter_intStackSize -= 2; if (Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) { var4 += var6[var4]; } - } else if (var13 == 10) { + } else if (var13 == ScriptOpcodes.IF_ICMPGT) { RouteStrategy.Interpreter_intStackSize -= 2; if (Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) { var4 += var6[var4]; } - } else if (var13 == 21) { + } else if (var13 == ScriptOpcodes.RETURN) { if (Interpreter.Interpreter_frameDepth == 0) { return; } @@ -233,47 +236,47 @@ public class GrandExchangeEvent { var4 = var30.pc; Username.Interpreter_intLocals = var30.intLocals; Interpreter.Interpreter_stringLocals = var30.stringLocals; - } else if (var13 == 25) { + } else if (var13 == ScriptOpcodes.GET_VARBIT) { var11 = var6[var4]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapSection2.getVarbit(var11); - } else if (var13 == 27) { + } else if (var13 == ScriptOpcodes.SET_VARBIT) { var11 = var6[var4]; PendingSpawn.method1695(var11, Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); - } else if (var13 == 31) { + } else if (var13 == ScriptOpcodes.IF_ICMPLE) { RouteStrategy.Interpreter_intStackSize -= 2; if (Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) { var4 += var6[var4]; } - } else if (var13 == 32) { + } else if (var13 == ScriptOpcodes.IF_ICMPGE) { RouteStrategy.Interpreter_intStackSize -= 2; if (Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) { var4 += var6[var4]; } - } else if (var13 == 33) { + } else if (var13 == ScriptOpcodes.ILOAD) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Username.Interpreter_intLocals[var6[var4]]; - } else if (var13 == 34) { + } else if (var13 == ScriptOpcodes.ISTORE) { Username.Interpreter_intLocals[var6[var4]] = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - } else if (var13 == 35) { + } else if (var13 == ScriptOpcodes.SLOAD) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Interpreter.Interpreter_stringLocals[var6[var4]]; - } else if (var13 == 36) { + } else if (var13 == ScriptOpcodes.SSTORE) { Interpreter.Interpreter_stringLocals[var6[var4]] = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - } else if (var13 == 37) { + } else if (var13 == ScriptOpcodes.JOIN_STRING) { var11 = var6[var4]; Interpreter.Interpreter_stringStackSize -= var11; String var29 = class277.method5356(Interpreter.Interpreter_stringStack, Interpreter.Interpreter_stringStackSize, var11); Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var29; - } else if (var13 == 38) { + } else if (var13 == ScriptOpcodes.POP_INT) { --RouteStrategy.Interpreter_intStackSize; - } else if (var13 == 39) { + } else if (var13 == ScriptOpcodes.POP_STRING) { --Interpreter.Interpreter_stringStackSize; } else { int var15; - if (var13 != 40) { - if (var13 == 42) { + if (var13 != ScriptOpcodes.INVOKE) { + if (var13 == ScriptOpcodes.GET_VARC_INT) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class196.varcs.getInt(var6[var4]); - } else if (var13 == 43) { + } else if (var13 == ScriptOpcodes.SET_VARC_INT) { class196.varcs.setInt(var6[var4], Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); - } else if (var13 == 44) { + } else if (var13 == ScriptOpcodes.DEFINE_ARRAY) { var11 = var6[var4] >> 16; var14 = var6[var4] & 65535; int var28 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; @@ -290,7 +293,7 @@ public class GrandExchangeEvent { for (var15 = 0; var15 < var28; ++var15) { Interpreter.Interpreter_arrays[var11][var15] = var33; } - } else if (var13 == 45) { + } else if (var13 == ScriptOpcodes.GET_ARRAY_INT) { var11 = var6[var4]; var14 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var11]) { @@ -298,7 +301,7 @@ public class GrandExchangeEvent { } Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var11][var14]; - } else if (var13 == 46) { + } else if (var13 == ScriptOpcodes.SET_ARRAY_INT) { var11 = var6[var4]; RouteStrategy.Interpreter_intStackSize -= 2; var14 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; @@ -307,22 +310,22 @@ public class GrandExchangeEvent { } Interpreter.Interpreter_arrays[var11][var14] = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; - } else if (var13 == 47) { + } else if (var13 == ScriptOpcodes.GET_VARC_STRING_OLD) { var12 = class196.varcs.getStringOld(var6[var4]); if (var12 == null) { var12 = "null"; } Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var12; - } else if (var13 == 48) { + } else if (var13 == ScriptOpcodes.SET_VARC_STRING_OLD) { class196.varcs.setStringOld(var6[var4], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); - } else if (var13 == 49) { + } else if (var13 == ScriptOpcodes.GET_VARC_STRING) { var12 = class196.varcs.getString(var6[var4]); Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var12; - } else if (var13 == 50) { + } else if (var13 == ScriptOpcodes.SET_VARC_STRING) { class196.varcs.setString(var6[var4], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); } else { - if (var13 != 60) { + if (var13 != ScriptOpcodes.SWITCH) { throw new IllegalStateException(); } diff --git a/runescape-client/src/main/java/GrandExchangeEvents.java b/runescape-client/src/main/java/GrandExchangeEvents.java index a880043184..8043c86470 100644 --- a/runescape-client/src/main/java/GrandExchangeEvents.java +++ b/runescape-client/src/main/java/GrandExchangeEvents.java @@ -7,18 +7,23 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("g") @Implements("GrandExchangeEvents") public class GrandExchangeEvents { @ObfuscatedName("f") - public static Comparator field371; + @Export("geAgeComparator") + public static Comparator geAgeComparator; @ObfuscatedName("q") - public static Comparator field372; + @Export("geUnitPriceComparator") + public static Comparator geUnitPriceComparator; @ObfuscatedName("w") - public static Comparator field373; + @Export("geItemNameComparator") + public static Comparator geItemNameComparator; @ObfuscatedName("o") - public static Comparator field374; + @Export("geTotalQuantityComparator") + public static Comparator geTotalQuantityComparator; @ObfuscatedName("z") @ObfuscatedGetter( intValue = -1605454211 @@ -78,14 +83,14 @@ public class GrandExchangeEvents { garbageValue = "1601363438" ) @Export("addChatMessage") - static void addChatMessage(int var0, String var1, String var2, String var3) { - ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); + static void addChatMessage(int type, String sender, String text, String prefix) { + ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(type); if (var4 == null) { var4 = new ChatChannel(); - Messages.Messages_channels.put(var0, var4); + Messages.Messages_channels.put(type, var4); } - Message var5 = var4.addMessage(var0, var1, var2, var3); + Message var5 = var4.addMessage(type, sender, text, prefix); Messages.Messages_hashTable.put(var5, (long)var5.count); Messages.Messages_queue.add(var5); Client.chatCycle = Client.cycleCntr; @@ -109,50 +114,50 @@ public class GrandExchangeEvents { ) static int method75(int var0, Script var1, boolean var2) { Widget var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); - if (var0 == 2600) { + if (var0 == ScriptOpcodes.IF_GETSCROLLX) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollX; return 1; - } else if (var0 == 2601) { + } else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollY; return 1; - } else if (var0 == 2602) { + } else if (var0 == ScriptOpcodes.IF_GETTEXT) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.text; return 1; - } else if (var0 == 2603) { + } else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollWidth; return 1; - } else if (var0 == 2604) { + } else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollHeight; return 1; - } else if (var0 == 2605) { + } else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelZoom; return 1; - } else if (var0 == 2606) { + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelAngleX; return 1; - } else if (var0 == 2607) { + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelAngleZ; return 1; - } else if (var0 == 2608) { + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelAngleY; return 1; - } else if (var0 == 2609) { + } else if (var0 == ScriptOpcodes.IF_GETTRANS) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.transparency; return 1; } else if (var0 == 2610) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.field960; return 1; - } else if (var0 == 2611) { + } else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.color; return 1; - } else if (var0 == 2612) { + } else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.color2; return 1; } else if (var0 == 2613) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.rectangleMode.rsOrdinal(); return 1; } else if (var0 == 2614) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.field964 ? 1 : 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; return 1; } else { return 2; @@ -165,17 +170,17 @@ public class GrandExchangeEvents { garbageValue = "-635606409" ) static final void method74(int var0, int var1) { - if (GroundItemPile.loadWidgetGroup(var0)) { - class30.method570(Widget.widgets[var0], var1); + if (GroundItemPile.loadInterface(var0)) { + class30.method570(Widget.interfaceComponents[var0], var1); } } static { - field371 = new class12(); - new WorldComparator(); - field372 = new UnitPriceComparator(); - field373 = new class11(); - field374 = new TotalQuantityComparator(); + geAgeComparator = new GrandExchangeOfferAgeComparator(); + new GrandExchangeOfferWorldComparator(); + geUnitPriceComparator = new GrandExchangeOfferUnitPriceComparator(); + geItemNameComparator = new GrandExchangeOfferNameComparator(); + geTotalQuantityComparator = new GrandExchangeOfferTotalQuantityComparator(); } } diff --git a/runescape-client/src/main/java/GrandExchangeOffer.java b/runescape-client/src/main/java/GrandExchangeOffer.java index de854bdb16..e88a74d43f 100644 --- a/runescape-client/src/main/java/GrandExchangeOffer.java +++ b/runescape-client/src/main/java/GrandExchangeOffer.java @@ -139,11 +139,11 @@ public class GrandExchangeOffer { garbageValue = "50" ) static int method101() { - if (Client.indexCacheLoaders != null && Client.indexCacheLoaderIndex < Client.indexCacheLoaders.size()) { + if (Client.archiveLoaders != null && Client.archiveLoaderArchive < Client.archiveLoaders.size()) { int var0 = 0; - for (int var1 = 0; var1 <= Client.indexCacheLoaderIndex; ++var1) { - var0 += ((IndexCacheLoader)Client.indexCacheLoaders.get(var1)).field409; + for (int var1 = 0; var1 <= Client.archiveLoaderArchive; ++var1) { + var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).field409; } return var0 * 10000 / Client.field140; diff --git a/runescape-client/src/main/java/class12.java b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java similarity index 85% rename from runescape-client/src/main/java/class12.java rename to runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java index e39aafbbb2..6a0f456579 100644 --- a/runescape-client/src/main/java/class12.java +++ b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java @@ -1,9 +1,12 @@ import java.util.Comparator; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("n") -final class class12 implements Comparator { +@Implements("GrandExchangeOfferAgeComparator") +final class GrandExchangeOfferAgeComparator implements Comparator { @ObfuscatedName("n") @ObfuscatedSignature( signature = "Lho;" @@ -15,7 +18,8 @@ final class class12 implements Comparator { signature = "(Ll;Ll;B)I", garbageValue = "-86" ) - int method149(GrandExchangeEvent var1, GrandExchangeEvent var2) { + @Export("compareTyped") + int compareTyped(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.field370 < var2.field370 ? -1 : (var1.field370 == var2.field370 ? 0 : 1); } @@ -24,7 +28,7 @@ final class class12 implements Comparator { } public int compare(Object var1, Object var2) { - return this.method149((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); + return this.compareTyped((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } @ObfuscatedName("m") @@ -123,11 +127,11 @@ final class class12 implements Comparator { garbageValue = "1731524026" ) static void method159() { - for (WidgetGroupParent var0 = (WidgetGroupParent)Client.widgetGroupParents.first(); var0 != null; var0 = (WidgetGroupParent)Client.widgetGroupParents.next()) { + for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { int var1 = var0.group; - if (GroundItemPile.loadWidgetGroup(var1)) { + if (GroundItemPile.loadInterface(var1)) { boolean var2 = true; - Widget[] var3 = Widget.widgets[var1]; + Widget[] var3 = Widget.interfaceComponents[var1]; int var4; for (var4 = 0; var4 < var3.length; ++var4) { diff --git a/runescape-client/src/main/java/class11.java b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java similarity index 74% rename from runescape-client/src/main/java/class11.java rename to runescape-client/src/main/java/GrandExchangeOfferNameComparator.java index f6646377ed..41dae69c39 100644 --- a/runescape-client/src/main/java/class11.java +++ b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java @@ -1,11 +1,14 @@ import java.util.Comparator; import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("k") -final class class11 implements Comparator { +@Implements("GrandExchangeOfferNameComparator") +final class GrandExchangeOfferNameComparator implements Comparator { @ObfuscatedName("hl") @ObfuscatedGetter( intValue = -1945589829 @@ -18,8 +21,9 @@ final class class11 implements Comparator { signature = "(Ll;Ll;B)I", garbageValue = "1" ) - int method138(GrandExchangeEvent var1, GrandExchangeEvent var2) { - return var1.method119().compareTo(var2.method119()); + @Export("compareTyped") + int compareTyped(GrandExchangeEvent var1, GrandExchangeEvent var2) { + return var1.getOfferName().compareTo(var2.getOfferName()); } public boolean equals(Object var1) { @@ -27,7 +31,7 @@ final class class11 implements Comparator { } public int compare(Object var1, Object var2) { - return this.method138((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); + return this.compareTyped((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } @ObfuscatedName("m") @@ -87,7 +91,7 @@ final class class11 implements Comparator { var0 -= 1000; var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); } else { - var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111; + var3 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111; } String var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; @@ -120,67 +124,67 @@ final class class11 implements Comparator { var8 = null; } - if (var0 == 1400) { + if (var0 == ScriptOpcodes.CC_SETONCLICK) { var3.onClick = var8; - } else if (var0 == 1401) { + } else if (var0 == ScriptOpcodes.CC_SETONHOLD) { var3.onHold = var8; - } else if (var0 == 1402) { + } else if (var0 == ScriptOpcodes.CC_SETONRELEASE) { var3.onRelease = var8; - } else if (var0 == 1403) { + } else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) { var3.onMouseOver = var8; - } else if (var0 == 1404) { + } else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) { var3.onMouseLeave = var8; - } else if (var0 == 1405) { + } else if (var0 == ScriptOpcodes.CC_SETONDRAG) { var3.onDrag = var8; - } else if (var0 == 1406) { + } else if (var0 == ScriptOpcodes.CC_SETONTARGETLEAVE) { var3.onTargetLeave = var8; - } else if (var0 == 1407) { + } else if (var0 == ScriptOpcodes.CC_SETONVARTRANSMIT) { var3.onVarTransmit = var8; var3.varTransmitTriggers = var5; - } else if (var0 == 1408) { + } else if (var0 == ScriptOpcodes.CC_SETONTIMER) { var3.onTimer = var8; - } else if (var0 == 1409) { + } else if (var0 == ScriptOpcodes.CC_SETONOP) { var3.onOp = var8; - } else if (var0 == 1410) { + } else if (var0 == ScriptOpcodes.CC_SETONDRAGCOMPLETE) { var3.onDragComplete = var8; - } else if (var0 == 1411) { + } else if (var0 == ScriptOpcodes.CC_SETONCLICKREPEAT) { var3.onClickRepeat = var8; - } else if (var0 == 1412) { + } else if (var0 == ScriptOpcodes.CC_SETONMOUSEREPEAT) { var3.onMouseRepeat = var8; - } else if (var0 == 1414) { + } else if (var0 == ScriptOpcodes.CC_SETONINVTRANSMIT) { var3.onInvTransmit = var8; var3.invTransmitTriggers = var5; - } else if (var0 == 1415) { + } else if (var0 == ScriptOpcodes.CC_SETONSTATTRANSMIT) { var3.onStatTransmit = var8; var3.statTransmitTriggers = var5; - } else if (var0 == 1416) { + } else if (var0 == ScriptOpcodes.CC_SETONTARGETENTER) { var3.onTargetEnter = var8; - } else if (var0 == 1417) { + } else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) { var3.onScroll = var8; - } else if (var0 == 1418) { - var3.field970 = var8; - } else if (var0 == 1419) { - var3.onKeyListener = var8; - } else if (var0 == 1420) { - var3.field971 = var8; - } else if (var0 == 1421) { - var3.field972 = var8; - } else if (var0 == 1422) { - var3.field973 = var8; - } else if (var0 == 1423) { - var3.onDialogAbortListener = var8; - } else if (var0 == 1424) { - var3.field974 = var8; - } else if (var0 == 1425) { - var3.field976 = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) { + var3.onChatTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONKEY) { + var3.onKey = var8; + } else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) { + var3.onFriendTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) { + var3.onClanTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) { + var3.onMiscTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) { + var3.onDialogAbort = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) { + var3.onSubChange = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) { + var3.onStockTransmit = var8; } else if (var0 == 1426) { var3.field977 = var8; } else { - if (var0 != 1427) { + if (var0 != ScriptOpcodes.CC_SETONRESIZE) { return 2; } - var3.field975 = var8; + var3.onResize = var8; } var3.hasListener = true; @@ -194,11 +198,11 @@ final class class11 implements Comparator { ) static int method146(int var0, Script var1, boolean var2) { Widget var3; - if (var0 == 2700) { + if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.itemId; return 1; - } else if (var0 == 2701) { + } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); if (var3.itemId != -1) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.itemQuantity; @@ -207,9 +211,9 @@ final class class11 implements Comparator { } return 1; - } else if (var0 == 2702) { + } else if (var0 == ScriptOpcodes.IF_HASSUB) { int var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - WidgetGroupParent var5 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var4); + InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var4); if (var5 != null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1; } else { @@ -217,8 +221,8 @@ final class class11 implements Comparator { } return 1; - } else if (var0 == 2706) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.rootWidgetGroup; + } else if (var0 == ScriptOpcodes.IF_GETTOP) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.rootInterface; return 1; } else { return 2; diff --git a/runescape-client/src/main/java/OwnWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java similarity index 63% rename from runescape-client/src/main/java/OwnWorldComparator.java rename to runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java index 4914d77bed..b7a541aaf0 100644 --- a/runescape-client/src/main/java/OwnWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java @@ -3,23 +3,26 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("bj") -@Implements("OwnWorldComparator") -public class OwnWorldComparator implements Comparator { +@Implements("GrandExchangeOfferOwnWorldComparator") +public class GrandExchangeOfferOwnWorldComparator implements Comparator { @ObfuscatedName("m") - boolean field666; + @Export("compareOwnWorld") + boolean compareOwnWorld; @ObfuscatedName("m") @ObfuscatedSignature( signature = "(Ll;Ll;B)I", garbageValue = "21" ) - int method234(GrandExchangeEvent var1, GrandExchangeEvent var2) { + @Export("compareTyped") + int compareTyped(GrandExchangeEvent var1, GrandExchangeEvent var2) { if (var2.world == var1.world) { return 0; } else { - if (this.field666) { + if (this.compareOwnWorld) { if (Client.worldId == var1.world) { return -1; } @@ -33,15 +36,12 @@ public class OwnWorldComparator implements Comparator { } } - @ObfuscatedName("equals") - public boolean method235(Object var1) { + public boolean equals(Object var1) { return super.equals(var1); } - @Export("compare") - @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.method234((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); + return this.compareTyped((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } @ObfuscatedName("al") @@ -51,32 +51,32 @@ public class OwnWorldComparator implements Comparator { ) static int method1285(int var0, Script var1, boolean var2) { int var3; - if (var0 == 5504) { + if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; int var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; if (!Client.isCameraLocked) { - Client.cameraPitchTarget = var3; - Client.minimapOrientation = var4; + Client.camAngleX = var3; + Client.camAngleY = var4; } return 1; - } else if (var0 == 5505) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.cameraPitchTarget; + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.camAngleX; return 1; - } else if (var0 == 5506) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.minimapOrientation; + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.camAngleY; return 1; - } else if (var0 == 5530) { + } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if (var3 < 0) { var3 = 0; } - Client.cameraFollowHeight = var3; + Client.camFollowHeight = var3; return 1; - } else if (var0 == 5531) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.cameraFollowHeight; + } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.camFollowHeight; return 1; } else { return 2; diff --git a/runescape-client/src/main/java/TotalQuantityComparator.java b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java similarity index 66% rename from runescape-client/src/main/java/TotalQuantityComparator.java rename to runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java index 7437594cb0..4b32d87fec 100644 --- a/runescape-client/src/main/java/TotalQuantityComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java @@ -5,25 +5,23 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("e") -@Implements("TotalQuantityComparator") -final class TotalQuantityComparator implements Comparator { +@Implements("GrandExchangeOfferTotalQuantityComparator") +final class GrandExchangeOfferTotalQuantityComparator implements Comparator { @ObfuscatedName("m") @ObfuscatedSignature( signature = "(Ll;Ll;I)I", garbageValue = "-573736433" ) - int method335(GrandExchangeEvent var1, GrandExchangeEvent var2) { + @Export("compareTyped") + int compareTyped(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.grandExchangeOffer.totalQuantity < var2.grandExchangeOffer.totalQuantity ? -1 : (var2.grandExchangeOffer.totalQuantity == var1.grandExchangeOffer.totalQuantity ? 0 : 1); } - @Export("compare") - @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.method335((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); + return this.compareTyped((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } - @ObfuscatedName("equals") - public boolean method336(Object var1) { + public boolean equals(Object var1) { return super.equals(var1); } @@ -33,18 +31,18 @@ final class TotalQuantityComparator implements Comparator { garbageValue = "46" ) @Export("loadTerrain") - static final void loadTerrain(Buffer var0, int var1, int var2, int var3, int var4, int var5, int var6) { + static final void loadTerrain(Buffer buffer, int plane, int x, int y, int x0, int y0, int var6) { int var7; - if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { - Tiles.Tiles_renderFlags[var1][var2][var3] = 0; + if (x >= 0 && x < 104 && y >= 0 && y < 104) { + Tiles.Tiles_renderFlags[plane][x][y] = 0; while (true) { - var7 = var0.readUnsignedByte(); + var7 = buffer.readUnsignedByte(); if (var7 == 0) { - if (var1 == 0) { - int[] var12 = Tiles.Tiles_heights[0][var2]; - int var9 = var2 + var4 + 932731; - int var10 = var3 + var5 + 556238; + if (plane == 0) { + int[] var12 = Tiles.Tiles_heights[0][x]; + int var9 = x + x0 + 932731; + int var10 = y + y0 + 556238; int var11 = Script.method2204(var9 + 45365, var10 + 91923, 4) - 128 + (Script.method2204(10294 + var9, 37821 + var10, 2) - 128 >> 1) + (Script.method2204(var9, var10, 1) - 128 >> 2); var11 = (int)((double)var11 * 0.3D) + 35; if (var11 < 10) { @@ -53,51 +51,51 @@ final class TotalQuantityComparator implements Comparator { var11 = 60; } - var12[var3] = -var11 * 8; + var12[y] = -var11 * 8; } else { - Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; + Tiles.Tiles_heights[plane][x][y] = Tiles.Tiles_heights[plane - 1][x][y] - 240; } break; } if (var7 == 1) { - int var8 = var0.readUnsignedByte(); + int var8 = buffer.readUnsignedByte(); if (var8 == 1) { var8 = 0; } - if (var1 == 0) { - Tiles.Tiles_heights[0][var2][var3] = -var8 * 8; + if (plane == 0) { + Tiles.Tiles_heights[0][x][y] = -var8 * 8; } else { - Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var8 * 8; + Tiles.Tiles_heights[plane][x][y] = Tiles.Tiles_heights[plane - 1][x][y] - var8 * 8; } break; } if (var7 <= 49) { - Fonts.field350[var1][var2][var3] = var0.readByte(); - class32.field1157[var1][var2][var3] = (byte)((var7 - 2) / 4); - class307.field1155[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); + Fonts.field350[plane][x][y] = buffer.readByte(); + class32.field1157[plane][x][y] = (byte)((var7 - 2) / 4); + class307.field1155[plane][x][y] = (byte)(var7 - 2 + var6 & 3); } else if (var7 <= 81) { - Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); + Tiles.Tiles_renderFlags[plane][x][y] = (byte)(var7 - 49); } else { - Tiles.field908[var1][var2][var3] = (byte)(var7 - 81); + Tiles.field908[plane][x][y] = (byte)(var7 - 81); } } } else { while (true) { - var7 = var0.readUnsignedByte(); + var7 = buffer.readUnsignedByte(); if (var7 == 0) { break; } if (var7 == 1) { - var0.readUnsignedByte(); + buffer.readUnsignedByte(); break; } if (var7 <= 49) { - var0.readUnsignedByte(); + buffer.readUnsignedByte(); } } } @@ -109,12 +107,12 @@ final class TotalQuantityComparator implements Comparator { signature = "(ILhu;ZI)V", garbageValue = "466862614" ) - static void method96(int var0, TileLocation var1, boolean var2) { + static void method96(int var0, Coord var1, boolean var2) { WorldMapArea var3 = BufferedFile.worldMap().getMapArea(var0); int var4 = Canvas.localPlayer.plane; int var5 = (Canvas.localPlayer.x >> 7) + class50.baseX; int var6 = (Canvas.localPlayer.y >> 7) + GraphicsObject.baseY; - TileLocation var7 = new TileLocation(var4, var5, var6); + Coord var7 = new Coord(var4, var5, var6); BufferedFile.worldMap().method367(var3, var7, var1, var2); } @@ -124,13 +122,13 @@ final class TotalQuantityComparator implements Comparator { garbageValue = "835715563" ) @Export("addPlayerToMenu") - static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { - if (Canvas.localPlayer != var0 && Client.menuOptionsCount < 400) { + static final void addPlayerToMenu(Player player, int menuArg0, int menuArg1, int menuArg2) { + if (Canvas.localPlayer != player && Client.menuOptionsCount < 400) { String var4; int var5; - if (var0.skillLevel == 0) { - String var6 = var0.actions[0] + var0.username + var0.actions[1]; - var5 = var0.combatLevel; + if (player.skillLevel == 0) { + String var6 = player.actions[0] + player.username + player.actions[1]; + var5 = player.combatLevel; int var7 = Canvas.localPlayer.combatLevel; int var8 = var7 - var5; String var9; @@ -154,17 +152,17 @@ final class TotalQuantityComparator implements Comparator { var9 = BufferedFile.colorStartTag(16776960); } - var4 = var6 + var9 + " (level-" + var0.combatLevel + ")" + var0.actions[2]; + var4 = var6 + var9 + " (level-" + player.combatLevel + ")" + player.actions[2]; } else { - var4 = var0.actions[0] + var0.username + var0.actions[1] + " (skill-" + var0.skillLevel + ")" + var0.actions[2]; + var4 = player.actions[0] + player.username + player.actions[1] + " (skill-" + player.skillLevel + ")" + player.actions[2]; } int var10; if (Client.isItemSelected == 1) { - Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(16777215) + var4, 14, var1, var2, var3); + Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(16777215) + var4, 14, menuArg0, menuArg1, menuArg2); } else if (Client.isSpellSelected) { if ((FloorDecoration.selectedSpellFlags & 8) == 8) { - Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(16777215) + var4, 15, var1, var2, var3); + Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(16777215) + var4, 15, menuArg0, menuArg1, menuArg2); } } else { for (var10 = 7; var10 >= 0; --var10) { @@ -175,12 +173,12 @@ final class TotalQuantityComparator implements Comparator { continue; } - if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || AttackOption.AttackOption_dependsOnCombatLevels == Client.playerAttackOption && var0.combatLevel > Canvas.localPlayer.combatLevel) { + if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || AttackOption.AttackOption_dependsOnCombatLevels == Client.playerAttackOption && player.combatLevel > Canvas.localPlayer.combatLevel) { var11 = 2000; } - if (Canvas.localPlayer.team != 0 && var0.team != 0) { - if (var0.team == Canvas.localPlayer.team) { + if (Canvas.localPlayer.team != 0 && player.team != 0) { + if (player.team == Canvas.localPlayer.team) { var11 = 2000; } else { var11 = 0; @@ -192,7 +190,7 @@ final class TotalQuantityComparator implements Comparator { boolean var12 = false; var5 = Client.playerMenuOpcodes[var10] + var11; - Tiles.insertMenuItemNoShift(Client.playerMenuActions[var10], BufferedFile.colorStartTag(16777215) + var4, var5, var1, var2, var3); + Tiles.insertMenuItemNoShift(Client.playerMenuActions[var10], BufferedFile.colorStartTag(16777215) + var4, var5, menuArg0, menuArg1, menuArg2); } } } diff --git a/runescape-client/src/main/java/UnitPriceComparator.java b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java similarity index 90% rename from runescape-client/src/main/java/UnitPriceComparator.java rename to runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java index d1c09b9fe3..924dc0bdbc 100644 --- a/runescape-client/src/main/java/UnitPriceComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java @@ -5,8 +5,8 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("d") -@Implements("UnitPriceComparator") -final class UnitPriceComparator implements Comparator { +@Implements("GrandExchangeOfferUnitPriceComparator") +final class GrandExchangeOfferUnitPriceComparator implements Comparator { @ObfuscatedName("gz") @ObfuscatedSignature( signature = "Lln;" @@ -25,18 +25,16 @@ final class UnitPriceComparator implements Comparator { signature = "(Ll;Ll;I)I", garbageValue = "-120071238" ) - int method337(GrandExchangeEvent var1, GrandExchangeEvent var2) { + @Export("compareTyped") + int compareTyped(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.grandExchangeOffer.unitPrice < var2.grandExchangeOffer.unitPrice ? -1 : (var2.grandExchangeOffer.unitPrice == var1.grandExchangeOffer.unitPrice ? 0 : 1); } - @Export("compare") - @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.method337((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); + return this.compareTyped((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } - @ObfuscatedName("equals") - public boolean method338(Object var1) { + public boolean equals(Object var1) { return super.equals(var1); } @@ -45,8 +43,9 @@ final class UnitPriceComparator implements Comparator { signature = "(Lir;B)V", garbageValue = "23" ) - public static void method135(AbstractIndexCache var0) { - VarbitDefinition.VarbitDefinition_indexCache = var0; + @Export("setVarbitDefinitionArchive") + public static void setVarbitDefinitionArchive(AbstractArchive var0) { + VarbitDefinition.VarbitDefinition_archive = var0; } @ObfuscatedName("m") @@ -85,7 +84,7 @@ final class UnitPriceComparator implements Comparator { } int var3 = WorldMapSection1.cameraX >> 7; - int var4 = class11.cameraZ >> 7; + int var4 = GrandExchangeOfferNameComparator.cameraZ >> 7; if (var3 < 0 || var4 < 0 || var3 >= 104 || var4 >= 104) { return SoundSystem.plane; } diff --git a/runescape-client/src/main/java/WorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java similarity index 89% rename from runescape-client/src/main/java/WorldComparator.java rename to runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java index c254ab0fe5..fe2abac0ab 100644 --- a/runescape-client/src/main/java/WorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java @@ -3,10 +3,11 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("u") -@Implements("WorldComparator") -final class WorldComparator implements Comparator { +@Implements("GrandExchangeOfferWorldComparator") +final class GrandExchangeOfferWorldComparator implements Comparator { @ObfuscatedName("n") public static boolean field988; @@ -15,18 +16,16 @@ final class WorldComparator implements Comparator { signature = "(Ll;Ll;I)I", garbageValue = "707844889" ) - int method358(GrandExchangeEvent var1, GrandExchangeEvent var2) { + @Export("compareTyped") + int compareTyped(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.world < var2.world ? -1 : (var2.world == var1.world ? 0 : 1); } - @Export("compare") - @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.method358((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); + return this.compareTyped((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } - @ObfuscatedName("equals") - public boolean method359(Object var1) { + public boolean equals(Object var1) { return super.equals(var1); } @@ -45,14 +44,14 @@ final class WorldComparator implements Comparator { garbageValue = "108" ) static int method68(int var0, Script var1, boolean var2) { - if (var0 == 3200) { + if (var0 == ScriptOpcodes.SOUND_SYNTH) { RouteStrategy.Interpreter_intStackSize -= 3; Ignored.queueSoundEffect(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize], Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]); return 1; - } else if (var0 == 3201) { + } else if (var0 == ScriptOpcodes.SOUND_SONG) { AbstractUserComparator.method5437(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); return 1; - } else if (var0 == 3202) { + } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { RouteStrategy.Interpreter_intStackSize -= 2; HealthBar.method1994(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize], Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); return 1; @@ -126,10 +125,10 @@ final class WorldComparator implements Comparator { var3.size = var3.definition.size; var3.field23 = var3.definition.field639; var3.walkSequence = var3.definition.walkSequence; - var3.walkTurnSequence = var3.definition.walkTurnSequence; - var3.walkTurnLeftSequence = var3.definition.walkTurnLeftSequence; - var3.walkTurnRightSequence = var3.definition.walkTurnRightSequence; - var3.idleSequence = var3.definition.idleSequence; + var3.walkBackSequence = var3.definition.walkBackSequence; + var3.walkLeftSequence = var3.definition.walkLeftSequence; + var3.walkRightSequence = var3.definition.walkRightSequence; + var3.readySequence = var3.definition.readySequence; var3.turnLeftSequence = var3.definition.turnLeftSequence; var3.turnRightSequence = var3.definition.turnRightSequence; } diff --git a/runescape-client/src/main/java/SpriteIds.java b/runescape-client/src/main/java/GraphicsDefaults.java similarity index 90% rename from runescape-client/src/main/java/SpriteIds.java rename to runescape-client/src/main/java/GraphicsDefaults.java index a21e1d23ec..bc393f6317 100644 --- a/runescape-client/src/main/java/SpriteIds.java +++ b/runescape-client/src/main/java/GraphicsDefaults.java @@ -5,8 +5,8 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("lg") -@Implements("SpriteIds") -public class SpriteIds { +@Implements("GraphicsDefaults") +public class GraphicsDefaults { @ObfuscatedName("m") @ObfuscatedGetter( intValue = 1673796151 @@ -72,7 +72,7 @@ public class SpriteIds { @Export("modIcons") public int modIcons; - public SpriteIds() { + public GraphicsDefaults() { this.field878 = -1; this.field879 = -1; this.mapScenes = -1; @@ -91,9 +91,9 @@ public class SpriteIds { signature = "(Lir;I)V", garbageValue = "1764356022" ) - @Export("read") - public void read(AbstractIndexCache var1) { - byte[] var2 = var1.takeRecordFlat(class311.field3810.field3809); + @Export("decode") + public void decode(AbstractArchive index) { + byte[] var2 = index.takeFileFlat(DefaultsGroup.DefaultsGroup_graphics.group); Buffer var3 = new Buffer(var2); while (true) { @@ -127,11 +127,11 @@ public class SpriteIds { signature = "(Lir;Lir;III)Lkk;", garbageValue = "195396240" ) - public static Font method5823(AbstractIndexCache var0, AbstractIndexCache var1, int var2, int var3) { + public static Font method5823(AbstractArchive var0, AbstractArchive var1, int var2, int var3) { if (!SpriteMask.loadSprite(var0, var2, var3)) { return null; } else { - byte[] var4 = var1.takeRecord(var2, var3); + byte[] var4 = var1.takeFile(var2, var3); Font var5; if (var4 == null) { var5 = null; @@ -142,7 +142,7 @@ public class SpriteIds { VarbitDefinition.indexedSpriteWidths = null; SecureRandomCallable.indexedSpriteHeights = null; class328.indexedSpritePalette = null; - class328.spritePixels = (byte[][])null; + class328.spritePixels = ((byte[][])null); var5 = var6; } diff --git a/runescape-client/src/main/java/GraphicsObject.java b/runescape-client/src/main/java/GraphicsObject.java index e6c943d2e2..3e7fdda8f4 100644 --- a/runescape-client/src/main/java/GraphicsObject.java +++ b/runescape-client/src/main/java/GraphicsObject.java @@ -108,9 +108,9 @@ public final class GraphicsObject extends Entity { garbageValue = "-730240149" ) @Export("advance") - final void advance(int var1) { + final void advance(int cycles) { if (!this.isFinished) { - this.frameCycle += var1; + this.frameCycle += cycles; while (this.frameCycle > this.sequenceDefinition.frameLengths[this.frame]) { this.frameCycle -= this.sequenceDefinition.frameLengths[this.frame]; diff --git a/runescape-client/src/main/java/GroundItem.java b/runescape-client/src/main/java/GroundItem.java index 076a89f0e3..a54b76c5bd 100644 --- a/runescape-client/src/main/java/GroundItem.java +++ b/runescape-client/src/main/java/GroundItem.java @@ -47,7 +47,8 @@ public final class GroundItem extends Entity { signature = "(II)V", garbageValue = "411352848" ) - static void method2095(int var0) { + @Export("setWindowedMode") + static void setWindowedMode(int var0) { Client.field99 = 0L; if (var0 >= 2) { Client.isResizable = true; @@ -55,7 +56,7 @@ public final class GroundItem extends Entity { Client.isResizable = false; } - if (SpotAnimationDefinition.method4822() == 1) { + if (SpotAnimationDefinition.getWindowedMode() == 1) { TextureProvider.client.setMaxCanvasSize(765, 503); } else { TextureProvider.client.setMaxCanvasSize(7680, 2160); diff --git a/runescape-client/src/main/java/GroundItemPile.java b/runescape-client/src/main/java/GroundItemPile.java index dbbc9aa6d2..dc6c145b69 100644 --- a/runescape-client/src/main/java/GroundItemPile.java +++ b/runescape-client/src/main/java/GroundItemPile.java @@ -67,38 +67,38 @@ public final class GroundItemPile { signature = "(IB)Z", garbageValue = "-60" ) - @Export("loadWidgetGroup") - public static boolean loadWidgetGroup(int var0) { - if (Widget.loadedWidgetGroups[var0]) { + @Export("loadInterface") + public static boolean loadInterface(int itf) { + if (Widget.loadedInterfaces[itf]) { return true; - } else if (!Widget.Widget_indexCache.tryLoadArchive(var0)) { + } else if (!Widget.Widget_archive.tryLoadGroup(itf)) { return false; } else { - int var1 = Widget.Widget_indexCache.method4(var0); + int var1 = Widget.Widget_archive.method4(itf); if (var1 == 0) { - Widget.loadedWidgetGroups[var0] = true; + Widget.loadedInterfaces[itf] = true; return true; } else { - if (Widget.widgets[var0] == null) { - Widget.widgets[var0] = new Widget[var1]; + if (Widget.interfaceComponents[itf] == null) { + Widget.interfaceComponents[itf] = new Widget[var1]; } for (int var2 = 0; var2 < var1; ++var2) { - if (Widget.widgets[var0][var2] == null) { - byte[] var3 = Widget.Widget_indexCache.takeRecord(var0, var2); + if (Widget.interfaceComponents[itf][var2] == null) { + byte[] var3 = Widget.Widget_archive.takeFile(itf, var2); if (var3 != null) { - Widget.widgets[var0][var2] = new Widget(); - Widget.widgets[var0][var2].id = var2 + (var0 << 16); + Widget.interfaceComponents[itf][var2] = new Widget(); + Widget.interfaceComponents[itf][var2].id = var2 + (itf << 16); if (var3[0] == -1) { - Widget.widgets[var0][var2].decode(new Buffer(var3)); + Widget.interfaceComponents[itf][var2].decode(new Buffer(var3)); } else { - Widget.widgets[var0][var2].decodeLegacy(new Buffer(var3)); + Widget.interfaceComponents[itf][var2].decodeLegacy(new Buffer(var3)); } } } } - Widget.loadedWidgetGroups[var0] = true; + Widget.loadedInterfaces[itf] = true; return true; } } diff --git a/runescape-client/src/main/java/GzipDecompressor.java b/runescape-client/src/main/java/GzipDecompressor.java index 2c1a5225b7..2907038b9f 100644 --- a/runescape-client/src/main/java/GzipDecompressor.java +++ b/runescape-client/src/main/java/GzipDecompressor.java @@ -55,19 +55,20 @@ public class GzipDecompressor { signature = "(II)Ljq;", garbageValue = "-1060388349" ) - public static StructDefinition method3702(int var0) { - StructDefinition var1 = (StructDefinition)StructDefinition.field886.get((long)var0); + @Export("getStructDefinition") + public static StructDefinition getStructDefinition(int var0) { + StructDefinition var1 = (StructDefinition)StructDefinition.StructDefinition_cached.get((long)var0); if (var1 != null) { return var1; } else { - byte[] var2 = StructDefinition.field885.takeRecord(34, var0); + byte[] var2 = StructDefinition.StructDefinition_archive.takeFile(34, var0); var1 = new StructDefinition(); if (var2 != null) { - var1.read(new Buffer(var2)); + var1.decode(new Buffer(var2)); } - var1.init(); - StructDefinition.field886.put(var1, (long)var0); + var1.postDecode(); + StructDefinition.StructDefinition_cached.put(var1, (long)var0); return var1; } } diff --git a/runescape-client/src/main/java/HealthBar.java b/runescape-client/src/main/java/HealthBar.java index 30b7bcba53..d0b0d00a2c 100644 --- a/runescape-client/src/main/java/HealthBar.java +++ b/runescape-client/src/main/java/HealthBar.java @@ -68,15 +68,15 @@ public class HealthBar extends Node { garbageValue = "1594721795" ) @Export("get") - HealthBarUpdate get(int var1) { + HealthBarUpdate get(int cycle) { HealthBarUpdate var2 = (HealthBarUpdate)this.updates.last(); - if (var2 != null && var2.cycle <= var1) { - for (HealthBarUpdate var3 = (HealthBarUpdate)this.updates.previous(); var3 != null && var3.cycle <= var1; var3 = (HealthBarUpdate)this.updates.previous()) { + if (var2 != null && var2.cycle <= cycle) { + for (HealthBarUpdate var3 = (HealthBarUpdate)this.updates.previous(); var3 != null && var3.cycle <= cycle; var3 = (HealthBarUpdate)this.updates.previous()) { var2.remove(); var2 = var3; } - if (this.definition.int5 + var2.cycleOffset + var2.cycle > var1) { + if (this.definition.int5 + var2.cycleOffset + var2.cycle > cycle) { return var2; } else { var2.remove(); @@ -105,66 +105,64 @@ public class HealthBar extends Node { @Export("charToByteCp1252") public static byte charToByteCp1252(char var0) { byte var1; - if ((var0 <= 0 || var0 >= 128) && (var0 < 160 || var0 > 255)) { - if (var0 == 8364) { - var1 = -128; - } else if (var0 == 8218) { - var1 = -126; - } else if (var0 == 402) { - var1 = -125; - } else if (var0 == 8222) { - var1 = -124; - } else if (var0 == 8230) { - var1 = -123; - } else if (var0 == 8224) { - var1 = -122; - } else if (var0 == 8225) { - var1 = -121; - } else if (var0 == 710) { - var1 = -120; - } else if (var0 == 8240) { - var1 = -119; - } else if (var0 == 352) { - var1 = -118; - } else if (var0 == 8249) { - var1 = -117; - } else if (var0 == 338) { - var1 = -116; - } else if (var0 == 381) { - var1 = -114; - } else if (var0 == 8216) { - var1 = -111; - } else if (var0 == 8217) { - var1 = -110; - } else if (var0 == 8220) { - var1 = -109; - } else if (var0 == 8221) { - var1 = -108; - } else if (var0 == 8226) { - var1 = -107; - } else if (var0 == 8211) { - var1 = -106; - } else if (var0 == 8212) { - var1 = -105; - } else if (var0 == 732) { - var1 = -104; - } else if (var0 == 8482) { - var1 = -103; - } else if (var0 == 353) { - var1 = -102; - } else if (var0 == 8250) { - var1 = -101; - } else if (var0 == 339) { - var1 = -100; - } else if (var0 == 382) { - var1 = -98; - } else if (var0 == 376) { - var1 = -97; - } else { - var1 = 63; - } - } else { + if (var0 > 0 && var0 < 128 || var0 >= 160 && var0 <= 255) { var1 = (byte)var0; + } else if (var0 == 8364) { + var1 = -128; + } else if (var0 == 8218) { + var1 = -126; + } else if (var0 == 402) { + var1 = -125; + } else if (var0 == 8222) { + var1 = -124; + } else if (var0 == 8230) { + var1 = -123; + } else if (var0 == 8224) { + var1 = -122; + } else if (var0 == 8225) { + var1 = -121; + } else if (var0 == 710) { + var1 = -120; + } else if (var0 == 8240) { + var1 = -119; + } else if (var0 == 352) { + var1 = -118; + } else if (var0 == 8249) { + var1 = -117; + } else if (var0 == 338) { + var1 = -116; + } else if (var0 == 381) { + var1 = -114; + } else if (var0 == 8216) { + var1 = -111; + } else if (var0 == 8217) { + var1 = -110; + } else if (var0 == 8220) { + var1 = -109; + } else if (var0 == 8221) { + var1 = -108; + } else if (var0 == 8226) { + var1 = -107; + } else if (var0 == 8211) { + var1 = -106; + } else if (var0 == 8212) { + var1 = -105; + } else if (var0 == 732) { + var1 = -104; + } else if (var0 == 8482) { + var1 = -103; + } else if (var0 == 353) { + var1 = -102; + } else if (var0 == 8250) { + var1 = -101; + } else if (var0 == 339) { + var1 = -100; + } else if (var0 == 382) { + var1 = -98; + } else if (var0 == 376) { + var1 = -97; + } else { + var1 = 63; } return var1; @@ -177,7 +175,7 @@ public class HealthBar extends Node { ) static void method1994(int var0, int var1) { if (Client.field128 != 0 && var0 != -1) { - Login.method2076(Login.indexCache11, var0, 0, Client.field128, false); + Login.method2076(Login.archive11, var0, 0, Client.field128, false); Client.field107 = true; } diff --git a/runescape-client/src/main/java/HealthBarDefinition.java b/runescape-client/src/main/java/HealthBarDefinition.java index a60a84437d..67f7ab1206 100644 --- a/runescape-client/src/main/java/HealthBarDefinition.java +++ b/runescape-client/src/main/java/HealthBarDefinition.java @@ -11,12 +11,12 @@ public class HealthBarDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field379; + public static AbstractArchive field379; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field380; + public static AbstractArchive field380; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Ler;" @@ -112,15 +112,15 @@ public class HealthBarDefinition extends DualNode { signature = "(Lgr;I)V", garbageValue = "280763431" ) - @Export("read") - public void read(Buffer var1) { + @Export("decode") + public void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -129,8 +129,8 @@ public class HealthBarDefinition extends DualNode { signature = "(Lgr;IB)V", garbageValue = "10" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { if (var2 == 1) { var1.readUnsignedShort(); } else if (var2 == 2) { diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java index 4251fa3e2c..4dd5c6279b 100644 --- a/runescape-client/src/main/java/HitSplatDefinition.java +++ b/runescape-client/src/main/java/HitSplatDefinition.java @@ -11,17 +11,17 @@ public class HitSplatDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - static AbstractIndexCache field382; + static AbstractArchive field382; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lir;" ) - static AbstractIndexCache field383; + static AbstractArchive field383; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lir;" ) - static AbstractIndexCache field384; + static AbstractArchive field384; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Ler;" @@ -141,15 +141,15 @@ public class HitSplatDefinition extends DualNode { signature = "(Lgr;I)V", garbageValue = "1963348982" ) - @Export("read") - void read(Buffer var1) { + @Export("decode") + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -158,8 +158,8 @@ public class HitSplatDefinition extends DualNode { signature = "(Lgr;II)V", garbageValue = "1789835753" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { if (var2 == 1) { this.fontId = var1.method51(); } else if (var2 == 2) { @@ -371,7 +371,7 @@ public class HitSplatDefinition extends DualNode { if (var1 != null) { return var1; } else { - var1 = SpriteIds.method5823(field383, field384, this.fontId, 0); + var1 = GraphicsDefaults.method5823(field383, field384, this.fontId, 0); if (var1 != null) { HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId); } diff --git a/runescape-client/src/main/java/Huffman.java b/runescape-client/src/main/java/Huffman.java index b8de92c5b8..3ec70bc75d 100644 --- a/runescape-client/src/main/java/Huffman.java +++ b/runescape-client/src/main/java/Huffman.java @@ -307,14 +307,14 @@ public class Huffman { public static Widget getWidget(int var0) { int var1 = var0 >> 16; int var2 = var0 & 65535; - if (Widget.widgets[var1] == null || Widget.widgets[var1][var2] == null) { - boolean var3 = GroundItemPile.loadWidgetGroup(var1); + if (Widget.interfaceComponents[var1] == null || Widget.interfaceComponents[var1][var2] == null) { + boolean var3 = GroundItemPile.loadInterface(var1); if (!var3) { return null; } } - return Widget.widgets[var1][var2]; + return Widget.interfaceComponents[var1][var2]; } @ObfuscatedName("m") diff --git a/runescape-client/src/main/java/IgnoreList.java b/runescape-client/src/main/java/IgnoreList.java index 2ba085647a..eac4b5886a 100644 --- a/runescape-client/src/main/java/IgnoreList.java +++ b/runescape-client/src/main/java/IgnoreList.java @@ -47,14 +47,14 @@ public class IgnoreList extends UserList { garbageValue = "32" ) @Export("read") - public void read(Buffer var1, int var2) { + public void read(Buffer buffer, int var2) { while (true) { - if (var1.index < var2) { - int var3 = var1.readUnsignedByte(); + if (buffer.index < var2) { + int var3 = buffer.readUnsignedByte(); boolean var4 = (var3 & 1) == 1; - Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); - Username var6 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); - var1.readStringCp1252NullTerminated(); + Username var5 = new Username(buffer.readStringCp1252NullTerminated(), this.loginType); + Username var6 = new Username(buffer.readStringCp1252NullTerminated(), this.loginType); + buffer.readStringCp1252NullTerminated(); if (var5 != null && var5.hasCleanName()) { Ignored var7 = (Ignored)this.getByCurrentUsername(var5); if (var4) { diff --git a/runescape-client/src/main/java/Ignored.java b/runescape-client/src/main/java/Ignored.java index dca7210b00..b716e2a1c0 100644 --- a/runescape-client/src/main/java/Ignored.java +++ b/runescape-client/src/main/java/Ignored.java @@ -21,9 +21,9 @@ public class Ignored extends User { signature = "(Lks;I)I", garbageValue = "-842469150" ) - @Export("compareTo00") - int compareTo00(Ignored var1) { - return this.id - var1.id; + @Export("compareToIgnored") + int compareToIgnored(Ignored other) { + return this.id - other.id; } @ObfuscatedName("aj") @@ -31,13 +31,13 @@ public class Ignored extends User { signature = "(Ljs;I)I", garbageValue = "1627362569" ) - public int compareTo0(User var1) { - return this.compareTo00((Ignored)var1); + @Export("compareToUser") + public int compareToUser(User var1) { + return this.compareToIgnored((Ignored)var1); } - @ObfuscatedName("compareTo") public int compareTo(Object var1) { - return this.compareTo00((Ignored)var1); + return this.compareToIgnored((Ignored)var1); } @ObfuscatedName("fv") diff --git a/runescape-client/src/main/java/IndexCacheLoader.java b/runescape-client/src/main/java/IndexCacheLoader.java deleted file mode 100644 index c4c05568d9..0000000000 --- a/runescape-client/src/main/java/IndexCacheLoader.java +++ /dev/null @@ -1,707 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("bd") -@Implements("IndexCacheLoader") -public class IndexCacheLoader { - @ObfuscatedName("pf") - @ObfuscatedSignature( - signature = "Lko;" - ) - static class310 field512; - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Llq;" - ) - @Export("titlebuttonSprite") - static IndexedSprite titlebuttonSprite; - @ObfuscatedName("x") - public static short[][] field406; - @ObfuscatedName("er") - @ObfuscatedGetter( - intValue = 636454135 - ) - static int field407; - @ObfuscatedName("gw") - @Export("regionMapArchiveIds") - static int[] regionMapArchiveIds; - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "Lit;" - ) - @Export("indexCache") - final IndexCache indexCache; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 1459455501 - ) - final int field408; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 782003089 - ) - int field409; - - @ObfuscatedSignature( - signature = "(Lit;Ljava/lang/String;)V" - ) - IndexCacheLoader(IndexCache var1, String var2) { - this.field409 = 0; - this.indexCache = var1; - this.field408 = var1.method5(); - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "1352221725" - ) - boolean method134() { - this.field409 = 0; - - for (int var1 = 0; var1 < this.field408; ++var1) { - if (!this.indexCache.method133(var1) || this.indexCache.method132(var1)) { - ++this.field409; - } - } - - return this.field409 >= this.field408; - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(Lkk;Lkk;Lkk;I)V", - garbageValue = "839403460" - ) - @Export("drawTitle") - static void drawTitle(Font var0, Font var1, Font var2) { - Login.xPadding = (SoundCache.canvasWidth - 765) / 2; - Login.loginBoxX = Login.xPadding + 202; - Varps.loginBoxCenter = Login.loginBoxX + 180; - int var3; - int var4; - int var5; - byte var6; - int var7; - int var8; - int var9; - int var10; - boolean var20; - if (Login.worldSelectOpen) { - if (class30.worldSelectBackSprites == null) { - class30.worldSelectBackSprites = class2.method20(WorldMapSection3.indexCache8, "sl_back", ""); - } - - IndexCache var11; - int var12; - int var13; - IndexedSprite[] var14; - if (Frames.worldSelectFlagSprites == null) { - var11 = WorldMapSection3.indexCache8; - var13 = var11.getArchiveId("sl_flags"); - var12 = var11.getRecordId(var13, ""); - if (!SpriteMask.loadSprite(var11, var13, var12)) { - var14 = null; - } else { - var14 = WorldMapLabel.createIndexedSpriteArray(); - } - - Frames.worldSelectFlagSprites = var14; - } - - if (AttackOption.worldSelectArrows == null) { - var11 = WorldMapSection3.indexCache8; - var13 = var11.getArchiveId("sl_arrows"); - var12 = var11.getRecordId(var13, ""); - if (!SpriteMask.loadSprite(var11, var13, var12)) { - var14 = null; - } else { - var14 = WorldMapLabel.createIndexedSpriteArray(); - } - - AttackOption.worldSelectArrows = var14; - } - - if (UrlRequest.worldSelectStars == null) { - var11 = WorldMapSection3.indexCache8; - var13 = var11.getArchiveId("sl_stars"); - var12 = var11.getRecordId(var13, ""); - if (!SpriteMask.loadSprite(var11, var13, var12)) { - var14 = null; - } else { - var14 = WorldMapLabel.createIndexedSpriteArray(); - } - - UrlRequest.worldSelectStars = var14; - } - - if (SecureRandomFuture.worldSelectLeftSprite == null) { - SecureRandomFuture.worldSelectLeftSprite = MenuAction.loadIndexedSpriteByName(WorldMapSection3.indexCache8, "leftarrow", ""); - } - - if (NetSocket.worldSelectRightSprite == null) { - NetSocket.worldSelectRightSprite = MenuAction.loadIndexedSpriteByName(WorldMapSection3.indexCache8, "rightarrow", ""); - } - - Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); - Rasterizer2D.drawGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); - Rasterizer2D.drawGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); - var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); - if (UrlRequest.worldSelectStars != null) { - UrlRequest.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); - var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); - UrlRequest.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); - var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); - } - - if (AttackOption.worldSelectArrows != null) { - var10 = Login.xPadding + 280; - if (World.sortOption1[0] == 0 && World.sortOption2[0] == 0) { - AttackOption.worldSelectArrows[2].drawAt(var10, 4); - } else { - AttackOption.worldSelectArrows[0].drawAt(var10, 4); - } - - if (World.sortOption1[0] == 0 && World.sortOption2[0] == 1) { - AttackOption.worldSelectArrows[3].drawAt(var10 + 15, 4); - } else { - AttackOption.worldSelectArrows[1].drawAt(var10 + 15, 4); - } - - var0.draw("World", var10 + 32, 17, 16777215, -1); - var7 = Login.xPadding + 390; - if (World.sortOption1[0] == 1 && World.sortOption2[0] == 0) { - AttackOption.worldSelectArrows[2].drawAt(var7, 4); - } else { - AttackOption.worldSelectArrows[0].drawAt(var7, 4); - } - - if (World.sortOption1[0] == 1 && World.sortOption2[0] == 1) { - AttackOption.worldSelectArrows[3].drawAt(var7 + 15, 4); - } else { - AttackOption.worldSelectArrows[1].drawAt(var7 + 15, 4); - } - - var0.draw("Players", var7 + 32, 17, 16777215, -1); - var13 = Login.xPadding + 500; - if (World.sortOption1[0] == 2 && World.sortOption2[0] == 0) { - AttackOption.worldSelectArrows[2].drawAt(var13, 4); - } else { - AttackOption.worldSelectArrows[0].drawAt(var13, 4); - } - - if (World.sortOption1[0] == 2 && World.sortOption2[0] == 1) { - AttackOption.worldSelectArrows[3].drawAt(var13 + 15, 4); - } else { - AttackOption.worldSelectArrows[1].drawAt(var13 + 15, 4); - } - - var0.draw("Location", var13 + 32, 17, 16777215, -1); - var12 = Login.xPadding + 610; - if (World.sortOption1[0] == 3 && World.sortOption2[0] == 0) { - AttackOption.worldSelectArrows[2].drawAt(var12, 4); - } else { - AttackOption.worldSelectArrows[0].drawAt(var12, 4); - } - - if (World.sortOption1[0] == 3 && World.sortOption2[0] == 1) { - AttackOption.worldSelectArrows[3].drawAt(var12 + 15, 4); - } else { - AttackOption.worldSelectArrows[1].drawAt(var12 + 15, 4); - } - - var0.draw("Type", var12 + 32, 17, 16777215, -1); - } - - Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); - var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); - Login.hoveredWorldIndex = -1; - if (class30.worldSelectBackSprites != null) { - var6 = 88; - byte var15 = 19; - var13 = 765 / (var6 + 1) - 1; - var12 = 480 / (var15 + 1); - - while (true) { - var8 = var12; - var9 = var13; - if (var12 * (var13 - 1) >= World.worldsCount) { - --var13; - } - - if (var13 * (var12 - 1) >= World.worldsCount) { - --var12; - } - - if (var13 * (var12 - 1) >= World.worldsCount) { - --var12; - } - - if (var12 == var8 && var13 == var9) { - var8 = (765 - var6 * var13) / (var13 + 1); - if (var8 > 5) { - var8 = 5; - } - - var9 = (480 - var15 * var12) / (var12 + 1); - if (var9 > 5) { - var9 = 5; - } - - var3 = (765 - var13 * var6 - var8 * (var13 - 1)) / 2; - int var16 = (480 - var12 * var15 - var9 * (var12 - 1)) / 2; - var4 = (var12 + World.worldsCount - 1) / var12; - Login.worldSelectPagesCount = var4 - var13; - if (SecureRandomFuture.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { - SecureRandomFuture.worldSelectLeftSprite.drawAt(8, Huffman.canvasHeight / 2 - SecureRandomFuture.worldSelectLeftSprite.subHeight / 2); - } - - if (NetSocket.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { - NetSocket.worldSelectRightSprite.drawAt(SoundCache.canvasWidth - NetSocket.worldSelectRightSprite.subWidth - 8, Huffman.canvasHeight / 2 - NetSocket.worldSelectRightSprite.subHeight / 2); - } - - int var17 = var16 + 23; - int var18 = var3 + Login.xPadding; - int var19 = 0; - var20 = false; - int var21 = Login.worldSelectPage; - - int var22; - for (var22 = var12 * var21; var22 < World.worldsCount && var21 - Login.worldSelectPage < var13; ++var22) { - World var23 = ItemContainer.worlds[var22]; - boolean var24 = true; - String var25 = Integer.toString(var23.population); - if (var23.population == -1) { - var25 = "OFF"; - var24 = false; - } else if (var23.population > 1980) { - var25 = "FULL"; - var24 = false; - } - - int var26 = 0; - byte var27; - if (var23.isBeta()) { - if (var23.isMembersOnly()) { - var27 = 7; - } else { - var27 = 6; - } - } else if (var23.isDeadman()) { - var26 = 16711680; - if (var23.isMembersOnly()) { - var27 = 5; - } else { - var27 = 4; - } - } else if (var23.isPvp()) { - if (var23.isMembersOnly()) { - var27 = 3; - } else { - var27 = 2; - } - } else if (var23.isMembersOnly()) { - var27 = 1; - } else { - var27 = 0; - } - - if (MouseHandler.MouseHandler_x >= var18 && MouseHandler.MouseHandler_y >= var17 && MouseHandler.MouseHandler_x < var18 + var6 && MouseHandler.MouseHandler_y < var15 + var17 && var24) { - Login.hoveredWorldIndex = var22; - class30.worldSelectBackSprites[var27].drawAtTransOverlay(var18, var17, 128, 16777215); - var20 = true; - } else { - class30.worldSelectBackSprites[var27].drawAt(var18, var17); - } - - if (Frames.worldSelectFlagSprites != null) { - Frames.worldSelectFlagSprites[(var23.isMembersOnly() ? 8 : 0) + var23.location].drawAt(var18 + 29, var17); - } - - var0.drawCentered(Integer.toString(var23.id), var18 + 15, var15 / 2 + var17 + 5, var26, -1); - var1.drawCentered(var25, var18 + 60, var15 / 2 + var17 + 5, 268435455, -1); - var17 = var17 + var9 + var15; - ++var19; - if (var19 >= var12) { - var17 = var16 + 23; - var18 = var18 + var6 + var8; - var19 = 0; - ++var21; - } - } - - if (var20) { - var22 = var1.stringWidth(ItemContainer.worlds[Login.hoveredWorldIndex].activity) + 6; - int var47 = var1.ascent + 8; - var5 = MouseHandler.MouseHandler_y + 25; - if (var47 + var5 > 480) { - var5 = MouseHandler.MouseHandler_y - 25 - var47; - } - - Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var22 / 2, var5, var22, var47, 16777120); - Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var22 / 2, var5, var22, var47, 0); - var1.drawCentered(ItemContainer.worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var5 + var1.ascent + 4, 0, -1); - } - break; - } - } - } - - class197.rasterProvider.drawFull(0, 0); - } else { - Login.leftTitleSprite.drawAt(Login.xPadding, 0); - Fonts.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - WorldMapSectionType.logoSprite.drawAt(Login.xPadding + 382 - WorldMapSectionType.logoSprite.subWidth / 2, 18); - if (Client.gameState == 0 || Client.gameState == 5) { - var6 = 20; - var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var6, 16777215, -1); - var7 = 253 - var6; - Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var7, 304, 34, 9179409); - Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var7 + 1, 302, 32, 0); - Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var7 + 2, Login.Login_loadingPercent * 3, 30, 9179409); - Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150 + Login.Login_loadingPercent * 3, var7 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); - var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var6, 16777215, -1); - } - - String var28; - String var29; - String var30; - String var31; - short var32; - String var33; - short var34; - if (Client.gameState == 20) { - Login.titleboxSprite.drawAt(Login.loginBoxX + 180 - Login.titleboxSprite.subWidth / 2, 271 - Login.titleboxSprite.subHeight / 2); - var32 = 201; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16776960, 0); - var10 = var32 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var10, 16776960, 0); - var10 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var10, 16776960, 0); - var10 += 15; - var10 += 7; - if (Login.loginIndex != 4) { - var0.draw("Login: ", Login.loginBoxX + 180 - 110, var10, 16777215, 0); - var34 = 200; - if (ReflectionCheck.clientPreferences.hideUsername) { - var29 = Login.Login_username; - var28 = class168.method3450('*', var29.length()); - var30 = var28; - } else { - var30 = Login.Login_username; - } - - for (var30 = var30; var0.stringWidth(var30) > var34; var30 = var30.substring(0, var30.length() - 1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var30), Login.loginBoxX + 180 - 70, var10, 16777215, 0); - var10 += 15; - var29 = "Password: "; - var33 = Login.Login_password; - var31 = class168.method3450('*', var33.length()); - var0.draw(var29 + var31, Login.loginBoxX + 180 - 108, var10, 16777215, 0); - var10 += 15; - } - } - - if (Client.gameState == 10 || Client.gameState == 11) { - Login.titleboxSprite.drawAt(Login.loginBoxX, 171); - short var35; - if (Login.loginIndex == 0) { - var32 = 251; - var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var32, 16776960, 0); - var10 = var32 + 30; - var7 = Login.loginBoxX + 180 - 80; - var35 = 291; - titlebuttonSprite.drawAt(var7 - 73, var35 - 20); - var0.drawLines("New User", var7 - 73, var35 - 20, 144, 40, 16777215, 0, 1, 1, 0); - var7 = Login.loginBoxX + 180 + 80; - titlebuttonSprite.drawAt(var7 - 73, var35 - 20); - var0.drawLines("Existing User", var7 - 73, var35 - 20, 144, 40, 16777215, 0, 1, 1, 0); - } else if (Login.loginIndex == 1) { - var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); - var32 = 236; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16777215, 0); - var10 = var32 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var10, 16777215, 0); - var10 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var10, 16777215, 0); - var10 += 15; - var7 = Login.loginBoxX + 180 - 80; - var35 = 321; - titlebuttonSprite.drawAt(var7 - 73, var35 - 20); - var0.drawCentered("Continue", var7, var35 + 5, 16777215, 0); - var7 = Login.loginBoxX + 180 + 80; - titlebuttonSprite.drawAt(var7 - 73, var35 - 20); - var0.drawCentered("Cancel", var7, var35 + 5, 16777215, 0); - } else if (Login.loginIndex == 2) { - var32 = 201; - var0.drawCentered(Login.Login_response1, Varps.loginBoxCenter, var32, 16776960, 0); - var10 = var32 + 15; - var0.drawCentered(Login.Login_response2, Varps.loginBoxCenter, var10, 16776960, 0); - var10 += 15; - var0.drawCentered(Login.Login_response3, Varps.loginBoxCenter, var10, 16776960, 0); - var10 += 15; - var10 += 7; - var0.draw("Login: ", Varps.loginBoxCenter - 110, var10, 16777215, 0); - var34 = 200; - if (ReflectionCheck.clientPreferences.hideUsername) { - var29 = Login.Login_username; - var28 = class168.method3450('*', var29.length()); - var30 = var28; - } else { - var30 = Login.Login_username; - } - - for (var30 = var30; var0.stringWidth(var30) > var34; var30 = var30.substring(1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var30) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? BufferedFile.colorStartTag(16776960) + "|" : ""), Varps.loginBoxCenter - 70, var10, 16777215, 0); - var10 += 15; - var29 = "Password: "; - var33 = Login.Login_password; - var31 = class168.method3450('*', var33.length()); - var0.draw(var29 + var31 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? BufferedFile.colorStartTag(16776960) + "|" : ""), Varps.loginBoxCenter - 108, var10, 16777215, 0); - var10 += 15; - var32 = 277; - var4 = Varps.loginBoxCenter + -117; - boolean var40 = Client.Login_isUsernameRemembered; - var20 = Login.field468; - IndexedSprite var46 = var40 ? (var20 ? KeyHandler.options_buttons_6Sprite : class308.options_buttons_2Sprite) : (var20 ? GraphicsObject.options_buttons_4Sprite : Login.options_buttons_0Sprite); - var46.drawAt(var4, var32); - var4 = var4 + var46.subWidth + 5; - var1.draw("Remember username", var4, var32 + 13, 16776960, 0); - var4 = Varps.loginBoxCenter + 24; - boolean var44 = ReflectionCheck.clientPreferences.hideUsername; - boolean var48 = Login.field469; - IndexedSprite var49 = var44 ? (var48 ? KeyHandler.options_buttons_6Sprite : class308.options_buttons_2Sprite) : (var48 ? GraphicsObject.options_buttons_4Sprite : Login.options_buttons_0Sprite); - var49.drawAt(var4, var32); - var4 = var4 + var49.subWidth + 5; - var1.draw("Hide username", var4, var32 + 13, 16776960, 0); - var10 = var32 + 15; - var5 = Varps.loginBoxCenter - 80; - short var50 = 321; - titlebuttonSprite.drawAt(var5 - 73, var50 - 20); - var0.drawCentered("Login", var5, var50 + 5, 16777215, 0); - var5 = Varps.loginBoxCenter + 80; - titlebuttonSprite.drawAt(var5 - 73, var50 - 20); - var0.drawCentered("Cancel", var5, var50 + 5, 16777215, 0); - var32 = 357; - switch(Login.field467) { - case 2: - AttackOption.field31 = "Having trouble logging in?"; - break; - default: - AttackOption.field31 = "Can't login? Click here."; - } - - TilePaint.field907 = new Bounds(Varps.loginBoxCenter, var32, var1.stringWidth(AttackOption.field31), 11); - UrlRequester.field930 = new Bounds(Varps.loginBoxCenter, var32, var1.stringWidth("Still having trouble logging in?"), 11); - var1.drawCentered(AttackOption.field31, Varps.loginBoxCenter, var32, 16777215, 0); - } else if (Login.loginIndex == 3) { - var32 = 201; - var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var32, 16776960, 0); - var10 = var32 + 20; - var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var10, 16776960, 0); - var10 += 15; - var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var10, 16776960, 0); - var10 += 15; - var7 = Login.loginBoxX + 180; - var35 = 276; - titlebuttonSprite.drawAt(var7 - 73, var35 - 20); - var2.drawCentered("Try again", var7, var35 + 5, 16777215, 0); - var7 = Login.loginBoxX + 180; - var35 = 326; - titlebuttonSprite.drawAt(var7 - 73, var35 - 20); - var2.drawCentered("Forgotten password?", var7, var35 + 5, 16777215, 0); - } else { - String var36; - if (Login.loginIndex == 4) { - var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); - var32 = 236; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16777215, 0); - var10 = var32 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var10, 16777215, 0); - var10 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var10, 16777215, 0); - var10 += 15; - var36 = "PIN: "; - var28 = Login.otp; - var30 = class168.method3450('*', var28.length()); - var0.draw(var36 + var30 + (Client.cycle % 40 < 20 ? BufferedFile.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var10, 16777215, 0); - var10 -= 8; - var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var10, 16776960, 0); - var10 += 15; - var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var10, 16776960, 0); - var9 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15; - var3 = var10 - var0.ascent; - IndexedSprite var43; - if (Login.field470) { - var43 = class308.options_buttons_2Sprite; - } else { - var43 = Login.options_buttons_0Sprite; - } - - var43.drawAt(var9, var3); - var10 += 15; - var4 = Login.loginBoxX + 180 - 80; - short var45 = 321; - titlebuttonSprite.drawAt(var4 - 73, var45 - 20); - var0.drawCentered("Continue", var4, var45 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180 + 80; - titlebuttonSprite.drawAt(var4 - 73, var45 - 20); - var0.drawCentered("Cancel", var4, var45 + 5, 16777215, 0); - var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var45 + 36, 255, 0); - } else { - short var37; - if (Login.loginIndex != 5) { - if (Login.loginIndex == 6) { - var32 = 201; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16776960, 0); - var10 = var32 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var10, 16776960, 0); - var10 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var10, 16776960, 0); - var10 += 15; - var7 = Login.loginBoxX + 180; - var35 = 321; - titlebuttonSprite.drawAt(var7 - 73, var35 - 20); - var0.drawCentered("Back", var7, var35 + 5, 16777215, 0); - } else if (Login.loginIndex == 7) { - var32 = 216; - var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var32, 16776960, 0); - var10 = var32 + 15; - var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var10, 16776960, 0); - var10 += 15; - var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var10, 16776960, 0); - var10 += 15; - var7 = Login.loginBoxX + 180 - 80; - var35 = 321; - titlebuttonSprite.drawAt(var7 - 73, var35 - 20); - var0.drawCentered("Set Date of Birth", var7, var35 + 5, 16777215, 0); - var7 = Login.loginBoxX + 180 + 80; - titlebuttonSprite.drawAt(var7 - 73, var35 - 20); - var0.drawCentered("Back", var7, var35 + 5, 16777215, 0); - } else if (Login.loginIndex == 8) { - var32 = 216; - var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var32, 16776960, 0); - var10 = var32 + 15; - var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var10, 16776960, 0); - var10 += 15; - var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var10, 16776960, 0); - var10 += 15; - var7 = Login.loginBoxX + 180 - 80; - var35 = 321; - titlebuttonSprite.drawAt(var7 - 73, var35 - 20); - var0.drawCentered("Privacy Policy", var7, var35 + 5, 16777215, 0); - var7 = Login.loginBoxX + 180 + 80; - titlebuttonSprite.drawAt(var7 - 73, var35 - 20); - var0.drawCentered("Back", var7, var35 + 5, 16777215, 0); - } else if (Login.loginIndex == 12) { - var32 = 201; - String var41 = ""; - var36 = ""; - var30 = ""; - switch(Login.field466) { - case 0: - var41 = "Your account has been disabled."; - var36 = Strings.field880; - var30 = ""; - break; - case 1: - var41 = "Account locked as we suspect it has been stolen."; - var36 = Strings.field881; - var30 = ""; - break; - default: - MouseHandler.method1084(false); - } - - var0.drawCentered(var41, Login.loginBoxX + 180, var32, 16776960, 0); - var10 = var32 + 15; - var2.drawCentered(var36, Login.loginBoxX + 180, var10, 16776960, 0); - var10 += 15; - var2.drawCentered(var30, Login.loginBoxX + 180, var10, 16776960, 0); - var10 += 15; - var8 = Login.loginBoxX + 180; - var37 = 276; - titlebuttonSprite.drawAt(var8 - 73, var37 - 20); - var0.drawCentered("Support Page", var8, var37 + 5, 16777215, 0); - var8 = Login.loginBoxX + 180; - var37 = 326; - titlebuttonSprite.drawAt(var8 - 73, var37 - 20); - var0.drawCentered("Back", var8, var37 + 5, 16777215, 0); - } - } else { - var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); - var32 = 221; - var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16776960, 0); - var10 = var32 + 15; - var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var10, 16776960, 0); - var10 += 15; - var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var10, 16776960, 0); - var10 += 15; - var10 += 14; - var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var10, 16777215, 0); - var34 = 174; - if (ReflectionCheck.clientPreferences.hideUsername) { - var29 = Login.Login_username; - var28 = class168.method3450('*', var29.length()); - var30 = var28; - } else { - var30 = Login.Login_username; - } - - for (var30 = var30; var0.stringWidth(var30) > var34; var30 = var30.substring(1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var30) + (Client.cycle % 40 < 20 ? BufferedFile.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var10, 16777215, 0); - var10 += 15; - var8 = Login.loginBoxX + 180 - 80; - var37 = 321; - titlebuttonSprite.drawAt(var8 - 73, var37 - 20); - var0.drawCentered("Recover", var8, var37 + 5, 16777215, 0); - var8 = Login.loginBoxX + 180 + 80; - titlebuttonSprite.drawAt(var8 - 73, var37 - 20); - var0.drawCentered("Back", var8, var37 + 5, 16777215, 0); - var37 = 356; - var1.drawCentered("Still having trouble logging in?", Varps.loginBoxCenter, var37, 268435455, 0); - } - } - } - } - - if (Client.gameState >= 10) { - int[] var38 = new int[4]; - Rasterizer2D.Rasterizer2D_getClipArray(var38); - Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, Huffman.canvasHeight); - class16.loginScreenRunesAnimation.method1782(Login.xPadding - 22, Client.cycle); - class16.loginScreenRunesAnimation.method1782(Login.xPadding + 22 + 765 - 128, Client.cycle); - Rasterizer2D.Rasterizer2D_setClipArray(var38); - } - - KeyHandler.title_muteSprite[ReflectionCheck.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); - if (Client.gameState > 5 && Client.language == 0) { - if (class277.field1144 != null) { - var10 = Login.xPadding + 5; - var34 = 463; - byte var39 = 100; - byte var42 = 35; - class277.field1144.drawAt(var10, var34); - var0.drawCentered("World " + Client.worldId, var39 / 2 + var10, var42 / 2 + var34 - 2, 16777215, 0); - if (FriendLoginUpdate.field356 != null) { - var1.drawCentered("Loading...", var39 / 2 + var10, var42 / 2 + var34 + 12, 16777215, 0); - } else { - var1.drawCentered("Click to switch", var39 / 2 + var10, var42 / 2 + var34 + 12, 16777215, 0); - } - } else { - class277.field1144 = MenuAction.loadIndexedSpriteByName(WorldMapSection3.indexCache8, "sl_button", ""); - } - } - } - - } -} diff --git a/runescape-client/src/main/java/IndexStore.java b/runescape-client/src/main/java/IndexStore.java deleted file mode 100644 index 673372a309..0000000000 --- a/runescape-client/src/main/java/IndexStore.java +++ /dev/null @@ -1,495 +0,0 @@ -import java.io.EOFException; -import java.io.IOException; -import net.runelite.mapping.Export; -import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ff") -@Implements("IndexStore") -public final class IndexStore { - @ObfuscatedName("m") - @Export("IndexStore_buffer") - static byte[] IndexStore_buffer; - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "Ldy;" - ) - @Export("dataFile") - BufferedFile dataFile; - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "Ldy;" - ) - @Export("indexFile") - BufferedFile indexFile; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -1982523283 - ) - @Export("index") - int index; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -748616567 - ) - @Export("maxEntrySize") - int maxEntrySize; - - @ObfuscatedSignature( - signature = "(ILdy;Ldy;I)V" - ) - public IndexStore(int var1, BufferedFile var2, BufferedFile var3, int var4) { - this.dataFile = null; - this.indexFile = null; - this.maxEntrySize = 65000; - this.index = var1; - this.dataFile = var2; - this.indexFile = var3; - this.maxEntrySize = var4; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "(II)[B", - garbageValue = "-294587791" - ) - @Export("read") - public byte[] read(int var1) { - BufferedFile var2 = this.dataFile; - synchronized(this.dataFile) { - byte[] var10000; - try { - Object var4; - if (this.indexFile.length() < (long)(var1 * 6 + 6)) { - var4 = null; - var10000 = (byte[])((byte[])var4); - return var10000; - } - - this.indexFile.seek((long)(var1 * 6)); - this.indexFile.read(IndexStore_buffer, 0, 6); - int var5 = ((IndexStore_buffer[0] & 255) << 16) + (IndexStore_buffer[2] & 255) + ((IndexStore_buffer[1] & 255) << 8); - int var6 = (IndexStore_buffer[5] & 255) + ((IndexStore_buffer[3] & 255) << 16) + ((IndexStore_buffer[4] & 255) << 8); - if (var5 < 0 || var5 > this.maxEntrySize) { - var4 = null; - var10000 = (byte[])((byte[])var4); - return var10000; - } - - if (var6 > 0 && (long)var6 <= this.dataFile.length() / 520L) { - byte[] var7 = new byte[var5]; - int var8 = 0; - int var9 = 0; - - while (var8 < var5) { - if (var6 == 0) { - var4 = null; - var10000 = (byte[])((byte[])var4); - return var10000; - } - - this.dataFile.seek((long)(var6 * 520)); - int var10 = var5 - var8; - if (var10 > 512) { - var10 = 512; - } - - this.dataFile.read(IndexStore_buffer, 0, var10 + 8); - int var11 = (IndexStore_buffer[1] & 255) + ((IndexStore_buffer[0] & 255) << 8); - int var12 = (IndexStore_buffer[3] & 255) + ((IndexStore_buffer[2] & 255) << 8); - int var13 = ((IndexStore_buffer[5] & 255) << 8) + ((IndexStore_buffer[4] & 255) << 16) + (IndexStore_buffer[6] & 255); - int var14 = IndexStore_buffer[7] & 255; - if (var11 == var1 && var9 == var12 && var14 == this.index) { - if (var13 >= 0 && (long)var13 <= this.dataFile.length() / 520L) { - for (int var15 = 0; var15 < var10; ++var15) { - var7[var8++] = IndexStore_buffer[var15 + 8]; - } - - var6 = var13; - ++var9; - continue; - } - - var4 = null; - var10000 = (byte[])((byte[])var4); - return var10000; - } - - var4 = null; - var10000 = (byte[])((byte[])var4); - return var10000; - } - - var10000 = var7; - return var10000; - } - - var4 = null; - var10000 = (byte[])((byte[])var4); - } catch (IOException var17) { - return null; - } - - return var10000; - } - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(I[BII)Z", - garbageValue = "-1750864122" - ) - @Export("write") - public boolean write(int var1, byte[] var2, int var3) { - BufferedFile var4 = this.dataFile; - synchronized(this.dataFile) { - if (var3 >= 0 && var3 <= this.maxEntrySize) { - boolean var6 = this.write0(var1, var2, var3, true); - if (!var6) { - var6 = this.write0(var1, var2, var3, false); - } - - return var6; - } else { - throw new IllegalArgumentException(); - } - } - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "(I[BIZI)Z", - garbageValue = "-944588642" - ) - @Export("write0") - boolean write0(int var1, byte[] var2, int var3, boolean var4) { - BufferedFile var5 = this.dataFile; - synchronized(this.dataFile) { - try { - int var7; - boolean var8; - boolean var10000; - if (var4) { - if (this.indexFile.length() < (long)(var1 * 6 + 6)) { - var8 = false; - var10000 = var8; - return var10000; - } - - this.indexFile.seek((long)(var1 * 6)); - this.indexFile.read(IndexStore_buffer, 0, 6); - var7 = (IndexStore_buffer[5] & 255) + ((IndexStore_buffer[3] & 255) << 16) + ((IndexStore_buffer[4] & 255) << 8); - if (var7 <= 0 || (long)var7 > this.dataFile.length() / 520L) { - var8 = false; - var10000 = var8; - return var10000; - } - } else { - var7 = (int)((this.dataFile.length() + 519L) / 520L); - if (var7 == 0) { - var7 = 1; - } - } - - IndexStore_buffer[0] = (byte)(var3 >> 16); - IndexStore_buffer[1] = (byte)(var3 >> 8); - IndexStore_buffer[2] = (byte)var3; - IndexStore_buffer[3] = (byte)(var7 >> 16); - IndexStore_buffer[4] = (byte)(var7 >> 8); - IndexStore_buffer[5] = (byte)var7; - this.indexFile.seek((long)(var1 * 6)); - this.indexFile.write(IndexStore_buffer, 0, 6); - int var9 = 0; - int var10 = 0; - - while (true) { - if (var9 < var3) { - label129: { - int var11 = 0; - int var12; - if (var4) { - this.dataFile.seek((long)(var7 * 520)); - - try { - this.dataFile.read(IndexStore_buffer, 0, 8); - } catch (EOFException var16) { - break label129; - } - - var12 = (IndexStore_buffer[1] & 255) + ((IndexStore_buffer[0] & 255) << 8); - int var13 = (IndexStore_buffer[3] & 255) + ((IndexStore_buffer[2] & 255) << 8); - var11 = ((IndexStore_buffer[5] & 255) << 8) + ((IndexStore_buffer[4] & 255) << 16) + (IndexStore_buffer[6] & 255); - int var14 = IndexStore_buffer[7] & 255; - if (var12 != var1 || var13 != var10 || var14 != this.index) { - var8 = false; - var10000 = var8; - return var10000; - } - - if (var11 < 0 || (long)var11 > this.dataFile.length() / 520L) { - var8 = false; - var10000 = var8; - return var10000; - } - } - - if (var11 == 0) { - var4 = false; - var11 = (int)((this.dataFile.length() + 519L) / 520L); - if (var11 == 0) { - ++var11; - } - - if (var7 == var11) { - ++var11; - } - } - - if (var3 - var9 <= 512) { - var11 = 0; - } - - IndexStore_buffer[0] = (byte)(var1 >> 8); - IndexStore_buffer[1] = (byte)var1; - IndexStore_buffer[2] = (byte)(var10 >> 8); - IndexStore_buffer[3] = (byte)var10; - IndexStore_buffer[4] = (byte)(var11 >> 16); - IndexStore_buffer[5] = (byte)(var11 >> 8); - IndexStore_buffer[6] = (byte)var11; - IndexStore_buffer[7] = (byte)this.index; - this.dataFile.seek((long)(var7 * 520)); - this.dataFile.write(IndexStore_buffer, 0, 8); - var12 = var3 - var9; - if (var12 > 512) { - var12 = 512; - } - - this.dataFile.write(var2, var9, var12); - var9 += var12; - var7 = var11; - ++var10; - continue; - } - } - - var8 = true; - var10000 = var8; - return var10000; - } - } catch (IOException var17) { - return false; - } - } - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "(IIILfe;Lfy;B)Z", - garbageValue = "1" - ) - static final boolean method3585(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4) { - int var5 = var0; - int var6 = var1; - byte var7 = 64; - byte var8 = 64; - int var9 = var0 - var7; - int var10 = var1 - var8; - class178.directions[var7][var8] = 99; - class178.distances[var7][var8] = 0; - byte var11 = 0; - int var12 = 0; - class178.bufferX[var11] = var0; - int var13 = var11 + 1; - class178.bufferY[var11] = var1; - int[][] var14 = var4.flags; - - label204: - while (var13 != var12) { - var5 = class178.bufferX[var12]; - var6 = class178.bufferY[var12]; - var12 = var12 + 1 & 4095; - int var19 = var5 - var9; - int var20 = var6 - var10; - int var15 = var5 - var4.xInset; - int var16 = var6 - var4.yInset; - if (var3.vmethod3644(var2, var5, var6, var4)) { - WidgetGroupParent.field986 = var5; - UrlRequester.field929 = var6; - return true; - } - - int var17 = class178.distances[var19][var20] + 1; - int var18; - if (var19 > 0 && class178.directions[var19 - 1][var20] == 0 && (var14[var15 - 1][var16] & 19136782) == 0 && (var14[var15 - 1][var16 + var2 - 1] & 19136824) == 0) { - var18 = 1; - - while (true) { - if (var18 >= var2 - 1) { - class178.bufferX[var13] = var5 - 1; - class178.bufferY[var13] = var6; - var13 = var13 + 1 & 4095; - class178.directions[var19 - 1][var20] = 2; - class178.distances[var19 - 1][var20] = var17; - break; - } - - if ((var14[var15 - 1][var18 + var16] & 19136830) != 0) { - break; - } - - ++var18; - } - } - - if (var19 < 128 - var2 && class178.directions[var19 + 1][var20] == 0 && (var14[var15 + var2][var16] & 19136899) == 0 && (var14[var15 + var2][var16 + var2 - 1] & 19136992) == 0) { - var18 = 1; - - while (true) { - if (var18 >= var2 - 1) { - class178.bufferX[var13] = var5 + 1; - class178.bufferY[var13] = var6; - var13 = var13 + 1 & 4095; - class178.directions[var19 + 1][var20] = 8; - class178.distances[var19 + 1][var20] = var17; - break; - } - - if ((var14[var15 + var2][var16 + var18] & 19136995) != 0) { - break; - } - - ++var18; - } - } - - if (var20 > 0 && class178.directions[var19][var20 - 1] == 0 && (var14[var15][var16 - 1] & 19136782) == 0 && (var14[var15 + var2 - 1][var16 - 1] & 19136899) == 0) { - var18 = 1; - - while (true) { - if (var18 >= var2 - 1) { - class178.bufferX[var13] = var5; - class178.bufferY[var13] = var6 - 1; - var13 = var13 + 1 & 4095; - class178.directions[var19][var20 - 1] = 1; - class178.distances[var19][var20 - 1] = var17; - break; - } - - if ((var14[var18 + var15][var16 - 1] & 19136911) != 0) { - break; - } - - ++var18; - } - } - - if (var20 < 128 - var2 && class178.directions[var19][var20 + 1] == 0 && (var14[var15][var16 + var2] & 19136824) == 0 && (var14[var15 + var2 - 1][var16 + var2] & 19136992) == 0) { - var18 = 1; - - while (true) { - if (var18 >= var2 - 1) { - class178.bufferX[var13] = var5; - class178.bufferY[var13] = var6 + 1; - var13 = var13 + 1 & 4095; - class178.directions[var19][var20 + 1] = 4; - class178.distances[var19][var20 + 1] = var17; - break; - } - - if ((var14[var18 + var15][var16 + var2] & 19137016) != 0) { - break; - } - - ++var18; - } - } - - if (var19 > 0 && var20 > 0 && class178.directions[var19 - 1][var20 - 1] == 0 && (var14[var15 - 1][var16 - 1] & 19136782) == 0) { - var18 = 1; - - while (true) { - if (var18 >= var2) { - class178.bufferX[var13] = var5 - 1; - class178.bufferY[var13] = var6 - 1; - var13 = var13 + 1 & 4095; - class178.directions[var19 - 1][var20 - 1] = 3; - class178.distances[var19 - 1][var20 - 1] = var17; - break; - } - - if ((var14[var15 - 1][var18 + (var16 - 1)] & 19136830) != 0 || (var14[var18 + (var15 - 1)][var16 - 1] & 19136911) != 0) { - break; - } - - ++var18; - } - } - - if (var19 < 128 - var2 && var20 > 0 && class178.directions[var19 + 1][var20 - 1] == 0 && (var14[var15 + var2][var16 - 1] & 19136899) == 0) { - var18 = 1; - - while (true) { - if (var18 >= var2) { - class178.bufferX[var13] = var5 + 1; - class178.bufferY[var13] = var6 - 1; - var13 = var13 + 1 & 4095; - class178.directions[var19 + 1][var20 - 1] = 9; - class178.distances[var19 + 1][var20 - 1] = var17; - break; - } - - if ((var14[var15 + var2][var18 + (var16 - 1)] & 19136995) != 0 || (var14[var18 + var15][var16 - 1] & 19136911) != 0) { - break; - } - - ++var18; - } - } - - if (var19 > 0 && var20 < 128 - var2 && class178.directions[var19 - 1][var20 + 1] == 0 && (var14[var15 - 1][var16 + var2] & 19136824) == 0) { - var18 = 1; - - while (true) { - if (var18 >= var2) { - class178.bufferX[var13] = var5 - 1; - class178.bufferY[var13] = var6 + 1; - var13 = var13 + 1 & 4095; - class178.directions[var19 - 1][var20 + 1] = 6; - class178.distances[var19 - 1][var20 + 1] = var17; - break; - } - - if ((var14[var15 - 1][var16 + var18] & 19136830) != 0 || (var14[var18 + (var15 - 1)][var16 + var2] & 19137016) != 0) { - break; - } - - ++var18; - } - } - - if (var19 < 128 - var2 && var20 < 128 - var2 && class178.directions[var19 + 1][var20 + 1] == 0 && (var14[var15 + var2][var16 + var2] & 19136992) == 0) { - for (var18 = 1; var18 < var2; ++var18) { - if ((var14[var15 + var18][var16 + var2] & 19137016) != 0 || (var14[var15 + var2][var18 + var16] & 19136995) != 0) { - continue label204; - } - } - - class178.bufferX[var13] = var5 + 1; - class178.bufferY[var13] = var6 + 1; - var13 = var13 + 1 & 4095; - class178.directions[var19 + 1][var20 + 1] = 12; - class178.distances[var19 + 1][var20 + 1] = var17; - } - } - - WidgetGroupParent.field986 = var5; - UrlRequester.field929 = var6; - return false; - } - - static { - IndexStore_buffer = new byte[520]; - } -} diff --git a/runescape-client/src/main/java/IndexStoreActionHandler.java b/runescape-client/src/main/java/IndexStoreActionHandler.java deleted file mode 100644 index 608fb79d1e..0000000000 --- a/runescape-client/src/main/java/IndexStoreActionHandler.java +++ /dev/null @@ -1,108 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("iv") -@Implements("IndexStoreActionHandler") -public class IndexStoreActionHandler implements Runnable { - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "Lje;" - ) - @Export("IndexStoreActionHandler_requestQueue") - static NodeDeque IndexStoreActionHandler_requestQueue; - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "Lje;" - ) - @Export("IndexStoreActionHandler_responseQueue") - static NodeDeque IndexStoreActionHandler_responseQueue; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -1282224505 - ) - static int field412; - @ObfuscatedName("w") - @Export("IndexStoreActionHandler_lock") - static Object IndexStoreActionHandler_lock; - - @Export("run") - @ObfuscatedName("run") - public void run() { - try { - while (true) { - NodeDeque var1 = IndexStoreActionHandler_requestQueue; - IndexStoreAction var2; - synchronized(IndexStoreActionHandler_requestQueue) { - var2 = (IndexStoreAction)IndexStoreActionHandler_requestQueue.last(); - } - - Object var3; - if (var2 != null) { - if (var2.type == 0) { - var2.indexStore.write((int)var2.key, var2.data, var2.data.length); - var1 = IndexStoreActionHandler_requestQueue; - synchronized(IndexStoreActionHandler_requestQueue) { - var2.remove(); - } - } else if (var2.type == 1) { - var2.data = var2.indexStore.read((int)var2.key); - var1 = IndexStoreActionHandler_requestQueue; - synchronized(IndexStoreActionHandler_requestQueue) { - IndexStoreActionHandler_responseQueue.addFirst(var2); - } - } - - var3 = IndexStoreActionHandler_lock; - synchronized(IndexStoreActionHandler_lock) { - if (field412 <= 1) { - field412 = 0; - IndexStoreActionHandler_lock.notifyAll(); - return; - } - - field412 = 600; - } - } else { - class203.method4010(100L); - var3 = IndexStoreActionHandler_lock; - synchronized(IndexStoreActionHandler_lock) { - if (field412 <= 1) { - field412 = 0; - IndexStoreActionHandler_lock.notifyAll(); - return; - } - - --field412; - } - } - } - } catch (Exception var14) { - NPCDefinition.sendStackTrace((String)null, var14); - } - } - - @ObfuscatedName("ky") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", - garbageValue = "67" - ) - static final void method4655(String var0) { - if (PacketWriter.clanChat != null) { - PacketBufferNode var1 = Interpreter.method1915(ClientPacket.field235, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(WorldMapRegion.method550(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.method241(var1); - } - - } - - static { - IndexStoreActionHandler_requestQueue = new NodeDeque(); - IndexStoreActionHandler_responseQueue = new NodeDeque(); - field412 = 0; - IndexStoreActionHandler_lock = new Object(); - } -} diff --git a/runescape-client/src/main/java/Instrument.java b/runescape-client/src/main/java/Instrument.java index 60c864797e..f398bd47db 100644 --- a/runescape-client/src/main/java/Instrument.java +++ b/runescape-client/src/main/java/Instrument.java @@ -159,7 +159,7 @@ public class Instrument { int var13; int var14; int var15; - int[] var10000; + int[] var16; for (var11 = 0; var11 < var1; ++var11) { var12 = this.field413.doStep(var1); var13 = this.field414.doStep(var1); @@ -181,39 +181,39 @@ public class Instrument { if (this.oscillatorVolume[var14] != 0) { var15 = Instrument_delays[var14] + var11; if (var15 < var1) { - var10000 = Instrument_samples; - var10000[var15] += this.evaluateWave(Instrument_phases[var14], var13 * Instrument_volumeSteps[var14] >> 15, this.field413.form); - var10000 = Instrument_phases; - var10000[var14] += (var12 * Instrument_pitchSteps[var14] >> 16) + Instrument_pitchBaseSteps[var14]; + var16 = Instrument_samples; + var16[var15] += this.evaluateWave(Instrument_phases[var14], var13 * Instrument_volumeSteps[var14] >> 15, this.field413.form); + var16 = Instrument_phases; + var16[var14] += (var12 * Instrument_pitchSteps[var14] >> 16) + Instrument_pitchBaseSteps[var14]; } } } } - int var16; + int var17; if (this.field419 != null) { this.field419.reset(); this.field420.reset(); var11 = 0; - boolean var17 = false; - boolean var18 = true; + boolean var18 = false; + boolean var19 = true; for (var14 = 0; var14 < var1; ++var14) { var15 = this.field419.doStep(var1); - var16 = this.field420.doStep(var1); - if (var18) { + var17 = this.field420.doStep(var1); + if (var19) { var12 = (var15 * (this.field419.end - this.field419.start) >> 8) + this.field419.start; } else { - var12 = (var16 * (this.field419.end - this.field419.start) >> 8) + this.field419.start; + var12 = (var17 * (this.field419.end - this.field419.start) >> 8) + this.field419.start; } var11 += 256; if (var11 >= var12) { var11 = 0; - var18 = !var18; + var19 = !var19; } - if (var18) { + if (var19) { Instrument_samples[var14] = 0; } } @@ -223,8 +223,8 @@ public class Instrument { var11 = (int)((double)this.delayTime * var3); for (var12 = var11; var12 < var1; ++var12) { - var10000 = Instrument_samples; - var10000[var12] += Instrument_samples[var12 - var11] * this.delayDecay / 100; + var16 = Instrument_samples; + var16[var12] += Instrument_samples[var12 - var11] * this.delayDecay / 100; } } @@ -240,19 +240,19 @@ public class Instrument { var15 = var1 - var12; } - int var19; + int var20; while (var14 < var15) { - var16 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.field35 >> 16); + var17 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.field35 >> 16); - for (var19 = 0; var19 < var12; ++var19) { - var16 += (int)((long)Instrument_samples[var14 + var12 - 1 - var19] * (long)AudioFilter.field33[0][var19] >> 16); + for (var20 = 0; var20 < var12; ++var20) { + var17 += (int)((long)Instrument_samples[var14 + var12 - 1 - var20] * (long)AudioFilter.field33[0][var20] >> 16); } - for (var19 = 0; var19 < var14; ++var19) { - var16 -= (int)((long)Instrument_samples[var14 - 1 - var19] * (long)AudioFilter.field33[1][var19] >> 16); + for (var20 = 0; var20 < var14; ++var20) { + var17 -= (int)((long)Instrument_samples[var14 - 1 - var20] * (long)AudioFilter.field33[1][var20] >> 16); } - Instrument_samples[var14] = var16; + Instrument_samples[var14] = var17; var11 = this.field421.doStep(var1 + 1); ++var14; } @@ -264,36 +264,36 @@ public class Instrument { var15 = var1 - var12; } - int var20; + int var21; while (var14 < var15) { - var19 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.field35 >> 16); + var20 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.field35 >> 16); - for (var20 = 0; var20 < var12; ++var20) { - var19 += (int)((long)Instrument_samples[var14 + var12 - 1 - var20] * (long)AudioFilter.field33[0][var20] >> 16); + for (var21 = 0; var21 < var12; ++var21) { + var20 += (int)((long)Instrument_samples[var14 + var12 - 1 - var21] * (long)AudioFilter.field33[0][var21] >> 16); } - for (var20 = 0; var20 < var13; ++var20) { - var19 -= (int)((long)Instrument_samples[var14 - 1 - var20] * (long)AudioFilter.field33[1][var20] >> 16); + for (var21 = 0; var21 < var13; ++var21) { + var20 -= (int)((long)Instrument_samples[var14 - 1 - var21] * (long)AudioFilter.field33[1][var21] >> 16); } - Instrument_samples[var14] = var19; + Instrument_samples[var14] = var20; var11 = this.field421.doStep(var1 + 1); ++var14; } if (var14 >= var1 - var12) { while (var14 < var1) { - var19 = 0; + var20 = 0; - for (var20 = var14 + var12 - var1; var20 < var12; ++var20) { - var19 += (int)((long)Instrument_samples[var14 + var12 - 1 - var20] * (long)AudioFilter.field33[0][var20] >> 16); + for (var21 = var14 + var12 - var1; var21 < var12; ++var21) { + var20 += (int)((long)Instrument_samples[var14 + var12 - 1 - var21] * (long)AudioFilter.field33[0][var21] >> 16); } - for (var20 = 0; var20 < var13; ++var20) { - var19 -= (int)((long)Instrument_samples[var14 - 1 - var20] * (long)AudioFilter.field33[1][var20] >> 16); + for (var21 = 0; var21 < var13; ++var21) { + var20 -= (int)((long)Instrument_samples[var14 - 1 - var21] * (long)AudioFilter.field33[1][var21] >> 16); } - Instrument_samples[var14] = var19; + Instrument_samples[var14] = var20; this.field421.doStep(var1 + 1); ++var14; } @@ -332,56 +332,56 @@ public class Instrument { signature = "(Lgr;)V" ) @Export("decode") - final void decode(Buffer var1) { + final void decode(Buffer buffer) { this.field413 = new SoundEnvelope(); - this.field413.decode(var1); + this.field413.decode(buffer); this.field414 = new SoundEnvelope(); - this.field414.decode(var1); - int var2 = var1.readUnsignedByte(); + this.field414.decode(buffer); + int var2 = buffer.readUnsignedByte(); if (var2 != 0) { - --var1.index; + --buffer.index; this.field415 = new SoundEnvelope(); - this.field415.decode(var1); + this.field415.decode(buffer); this.field416 = new SoundEnvelope(); - this.field416.decode(var1); + this.field416.decode(buffer); } - var2 = var1.readUnsignedByte(); + var2 = buffer.readUnsignedByte(); if (var2 != 0) { - --var1.index; + --buffer.index; this.field417 = new SoundEnvelope(); - this.field417.decode(var1); + this.field417.decode(buffer); this.field418 = new SoundEnvelope(); - this.field418.decode(var1); + this.field418.decode(buffer); } - var2 = var1.readUnsignedByte(); + var2 = buffer.readUnsignedByte(); if (var2 != 0) { - --var1.index; + --buffer.index; this.field419 = new SoundEnvelope(); - this.field419.decode(var1); + this.field419.decode(buffer); this.field420 = new SoundEnvelope(); - this.field420.decode(var1); + this.field420.decode(buffer); } for (int var3 = 0; var3 < 10; ++var3) { - int var4 = var1.method48(); + int var4 = buffer.method48(); if (var4 == 0) { break; } this.oscillatorVolume[var3] = var4; - this.oscillatorPitch[var3] = var1.method47(); - this.oscillatorDelays[var3] = var1.method48(); + this.oscillatorPitch[var3] = buffer.method47(); + this.oscillatorDelays[var3] = buffer.method48(); } - this.delayTime = var1.method48(); - this.delayDecay = var1.method48(); - this.duration = var1.readUnsignedShort(); - this.offset = var1.readUnsignedShort(); + this.delayTime = buffer.method48(); + this.delayDecay = buffer.method48(); + this.duration = buffer.readUnsignedShort(); + this.offset = buffer.readUnsignedShort(); this.filter = new AudioFilter(); this.field421 = new SoundEnvelope(); - this.filter.method27(var1, this.field421); + this.filter.method27(buffer, this.field421); } static { diff --git a/runescape-client/src/main/java/WidgetGroupParent.java b/runescape-client/src/main/java/InterfaceParent.java similarity index 84% rename from runescape-client/src/main/java/WidgetGroupParent.java rename to runescape-client/src/main/java/InterfaceParent.java index 19c90b5d88..a19bdf72c4 100644 --- a/runescape-client/src/main/java/WidgetGroupParent.java +++ b/runescape-client/src/main/java/InterfaceParent.java @@ -5,8 +5,8 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("bx") -@Implements("WidgetGroupParent") -public class WidgetGroupParent extends Node { +@Implements("InterfaceParent") +public class InterfaceParent extends Node { @ObfuscatedName("px") @ObfuscatedSignature( signature = "Lln;" @@ -34,7 +34,7 @@ public class WidgetGroupParent extends Node { @Export("keep") boolean keep; - WidgetGroupParent() { + InterfaceParent() { this.keep = false; } @@ -49,11 +49,11 @@ public class WidgetGroupParent extends Node { return var2; } else { String var3 = String.valueOf(var0); - int var4 = Formatting.indexCache12.getArchiveId(var3); + int var4 = Formatting.archive12.getGroupId(var3); if (var4 == -1) { return null; } else { - byte[] var5 = Formatting.indexCache12.takeRecordFlat(var4); + byte[] var5 = Formatting.archive12.takeFileFlat(var4); if (var5 != null) { if (var5.length <= 1) { return null; @@ -77,12 +77,12 @@ public class WidgetGroupParent extends Node { garbageValue = "619422509" ) @Export("decodeStringCp1252") - public static String decodeStringCp1252(byte[] var0, int var1, int var2) { - char[] var3 = new char[var2]; + public static String decodeStringCp1252(byte[] src, int srcStart, int length) { + char[] var3 = new char[length]; int var4 = 0; - for (int var5 = 0; var5 < var2; ++var5) { - int var6 = var0[var5 + var1] & 255; + for (int var5 = 0; var5 < length; ++var5) { + int var6 = src[var5 + srcStart] & 255; if (var6 != 0) { if (var6 >= 128 && var6 < 160) { char var7 = class304.cp1252AsciiExtension[var6 - 128]; diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java index 80135fddbd..26455786ac 100644 --- a/runescape-client/src/main/java/Interpreter.java +++ b/runescape-client/src/main/java/Interpreter.java @@ -105,10 +105,10 @@ public class Interpreter { if (var1 != null) { return var1; } else { - byte[] var2 = EnumDefinition.EnumDefinition_indexCache.takeRecord(8, var0); + byte[] var2 = EnumDefinition.EnumDefinition_archive.takeFile(8, var0); var1 = new EnumDefinition(); if (var2 != null) { - var1.read(new Buffer(var2)); + var1.decode(new Buffer(var2)); } EnumDefinition.EnumDefinition_cached.put(var1, (long)var0); @@ -187,11 +187,11 @@ public class Interpreter { ) @Export("drawWidgets") static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (GroundItemPile.loadWidgetGroup(var0)) { + if (GroundItemPile.loadInterface(var0)) { class279.field1145 = null; - DevicePcmPlayerProvider.drawWidgetGroup(Widget.widgets[var0], -1, var1, var2, var3, var4, var5, var6, var7); + DevicePcmPlayerProvider.drawInterface(Widget.interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); if (class279.field1145 != null) { - DevicePcmPlayerProvider.drawWidgetGroup(class279.field1145, -1412584499, var1, var2, var3, var4, class54.field1161, class157.field1114, var7); + DevicePcmPlayerProvider.drawInterface(class279.field1145, -1412584499, var1, var2, var3, var4, class54.field1161, BuddyRankComparator.field1114, var7); class279.field1145 = null; } } else if (var7 != -1) { diff --git a/runescape-client/src/main/java/InvDefinition.java b/runescape-client/src/main/java/InvDefinition.java index 0d3f76361b..a762466103 100644 --- a/runescape-client/src/main/java/InvDefinition.java +++ b/runescape-client/src/main/java/InvDefinition.java @@ -11,7 +11,8 @@ public class InvDefinition extends DualNode { @ObfuscatedSignature( signature = "Ler;" ) - static EvictingDualNodeHashTable field427; + @Export("InvDefinition_cached") + static EvictingDualNodeHashTable InvDefinition_cached; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 1358868971 @@ -28,15 +29,15 @@ public class InvDefinition extends DualNode { signature = "(Lgr;I)V", garbageValue = "628080573" ) - @Export("read") - void read(Buffer var1) { + @Export("decode") + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -45,8 +46,8 @@ public class InvDefinition extends DualNode { signature = "(Lgr;II)V", garbageValue = "1763455566" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { if (var2 == 2) { this.size = var1.readUnsignedShort(); } @@ -59,10 +60,10 @@ public class InvDefinition extends DualNode { garbageValue = "-121177696" ) public static void method4754() { - ParamKeyDefinition.ParamKeyDefinition_cached.clear(); + ParamDefinition.ParamDefinition_cached.clear(); } static { - field427 = new EvictingDualNodeHashTable(64); + InvDefinition_cached = new EvictingDualNodeHashTable(64); } } diff --git a/runescape-client/src/main/java/IsaacCipher.java b/runescape-client/src/main/java/IsaacCipher.java index a1f33c11cd..b7c0bfef42 100644 --- a/runescape-client/src/main/java/IsaacCipher.java +++ b/runescape-client/src/main/java/IsaacCipher.java @@ -238,9 +238,9 @@ public final class IsaacCipher { signature = "(Lir;Lir;I)V", garbageValue = "75867683" ) - public static void method4082(AbstractIndexCache var0, AbstractIndexCache var1) { - NPCDefinition.NpcDefinition_indexCache = var0; - NPCDefinition.NpcDefinition_modelIndexCache = var1; + public static void method4082(AbstractArchive var0, AbstractArchive var1) { + NPCDefinition.NpcDefinition_archive = var0; + NPCDefinition.NpcDefinition_modelArchive = var1; } @ObfuscatedName("fl") @@ -263,7 +263,7 @@ public final class IsaacCipher { } else if (var0 == 5) { Login.field467 = 2; class54.method1089("Your account has not logged out from its last", "session or the server is too busy right now.", "Please try again in a few minutes."); - } else if (var0 != 68 && (Client.field162 || var0 != 6)) { + } else if (var0 != 68 && (Client.onMobile || var0 != 6)) { if (var0 == 7) { class54.method1089("This world is full.", "Please use a different world.", ""); } else if (var0 == 8) { diff --git a/runescape-client/src/main/java/ItemContainer.java b/runescape-client/src/main/java/ItemContainer.java index 4404e399d1..b29e3ea6c9 100644 --- a/runescape-client/src/main/java/ItemContainer.java +++ b/runescape-client/src/main/java/ItemContainer.java @@ -22,7 +22,7 @@ public class ItemContainer extends Node { @ObfuscatedSignature( signature = "Lit;" ) - static IndexCache field434; + static Archive field434; @ObfuscatedName("f") @Export("ids") int[] ids; @@ -55,18 +55,18 @@ public class ItemContainer extends Node { if (var1 != null) { return var1; } else { - AbstractIndexCache var2 = SequenceDefinition.field773; - AbstractIndexCache var3 = SequenceDefinition.field774; + AbstractArchive var2 = SequenceDefinition.field773; + AbstractArchive var3 = SequenceDefinition.field774; boolean var4 = true; int[] var5 = var2.method3(var0); for (int var6 = 0; var6 < var5.length; ++var6) { - byte[] var7 = var2.getRecord(var0, var5[var6]); + byte[] var7 = var2.getFile(var0, var5[var6]); if (var7 == null) { var4 = false; } else { int var8 = (var7[0] & 255) << 8 | var7[1] & 255; - byte[] var9 = var3.getRecord(var8, 0); + byte[] var9 = var3.getFile(var8, 0); if (var9 == null) { var4 = false; } diff --git a/runescape-client/src/main/java/ItemDefinition.java b/runescape-client/src/main/java/ItemDefinition.java index 999e16be6f..ebd5c220fd 100644 --- a/runescape-client/src/main/java/ItemDefinition.java +++ b/runescape-client/src/main/java/ItemDefinition.java @@ -11,14 +11,14 @@ public class ItemDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("ItemDefinition_indexCache") - public static AbstractIndexCache ItemDefinition_indexCache; + @Export("ItemDefinition_archive") + public static AbstractArchive ItemDefinition_archive; @ObfuscatedName("g") @ObfuscatedSignature( signature = "Lir;" ) - @Export("ItemDefinition_modelIndexCache") - public static AbstractIndexCache ItemDefinition_modelIndexCache; + @Export("ItemDefinition_modelArchive") + public static AbstractArchive ItemDefinition_modelArchive; @ObfuscatedName("x") @ObfuscatedSignature( signature = "Ler;" @@ -47,7 +47,8 @@ public class ItemDefinition extends DualNode { @ObfuscatedGetter( intValue = 1070080857 ) - int field435; + @Export("model") + int model; @ObfuscatedName("z") @Export("name") public String name; @@ -124,8 +125,8 @@ public class ItemDefinition extends DualNode { @ObfuscatedGetter( intValue = 881309855 ) - @Export("shiftClickIndex0") - int shiftClickIndex0; + @Export("shiftClickIndex") + int shiftClickIndex; @ObfuscatedName("ah") @ObfuscatedGetter( intValue = 939367983 @@ -199,9 +200,11 @@ public class ItemDefinition extends DualNode { @Export("femaleHeadModel2") int femaleHeadModel2; @ObfuscatedName("az") - int[] field436; + @Export("countobj") + int[] countobj; @ObfuscatedName("au") - int[] field437; + @Export("countco") + int[] countco; @ObfuscatedName("ao") @ObfuscatedGetter( intValue = 619422509 @@ -248,8 +251,8 @@ public class ItemDefinition extends DualNode { @ObfuscatedGetter( intValue = -1057008657 ) - @Export("int1") - public int int1; + @Export("team") + public int team; @ObfuscatedName("bq") @ObfuscatedSignature( signature = "Llh;" @@ -297,7 +300,7 @@ public class ItemDefinition extends DualNode { this.isMembersOnly = false; this.groundActions = new String[]{null, null, "Take", null, null}; this.inventoryActions = new String[]{null, null, null, null, "Drop"}; - this.shiftClickIndex0 = -2; + this.shiftClickIndex = -2; this.maleModel = -1; this.maleModel1 = -1; this.maleOffset = 0; @@ -317,7 +320,7 @@ public class ItemDefinition extends DualNode { this.resizeZ = 128; this.ambient = 0; this.contrast = 0; - this.int1 = 0; + this.team = 0; this.isTradable = false; this.unnotedId = -1; this.notedId = -1; @@ -339,15 +342,15 @@ public class ItemDefinition extends DualNode { signature = "(Lgr;I)V", garbageValue = "-781492560" ) - @Export("read") - void read(Buffer var1) { + @Export("decode") + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -356,10 +359,10 @@ public class ItemDefinition extends DualNode { signature = "(Lgr;II)V", garbageValue = "-1975780739" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { if (var2 == 1) { - this.field435 = var1.readUnsignedShort(); + this.model = var1.readUnsignedShort(); } else if (var2 == 2) { this.name = var1.readStringCp1252NullTerminated(); } else if (var2 == 4) { @@ -423,7 +426,7 @@ public class ItemDefinition extends DualNode { this.retextureTo[var4] = (short)var1.readUnsignedShort(); } } else if (var2 == 42) { - this.shiftClickIndex0 = var1.readByte(); + this.shiftClickIndex = var1.readByte(); } else if (var2 == 65) { this.isTradable = true; } else if (var2 == 78) { @@ -445,13 +448,13 @@ public class ItemDefinition extends DualNode { } else if (var2 == 98) { this.noteTemplate = var1.readUnsignedShort(); } else if (var2 >= 100 && var2 < 110) { - if (this.field436 == null) { - this.field436 = new int[10]; - this.field437 = new int[10]; + if (this.countobj == null) { + this.countobj = new int[10]; + this.countco = new int[10]; } - this.field436[var2 - 100] = var1.readUnsignedShort(); - this.field437[var2 - 100] = var1.readUnsignedShort(); + this.countobj[var2 - 100] = var1.readUnsignedShort(); + this.countco[var2 - 100] = var1.readUnsignedShort(); } else if (var2 == 110) { this.resizeX = var1.readUnsignedShort(); } else if (var2 == 111) { @@ -463,7 +466,7 @@ public class ItemDefinition extends DualNode { } else if (var2 == 114) { this.contrast = var1.readByte(); } else if (var2 == 115) { - this.int1 = var1.readUnsignedByte(); + this.team = var1.readUnsignedByte(); } else if (var2 == 139) { this.unnotedId = var1.readUnsignedShort(); } else if (var2 == 140) { @@ -473,7 +476,7 @@ public class ItemDefinition extends DualNode { } else if (var2 == 149) { this.placeholderTemplate = var1.readUnsignedShort(); } else if (var2 == 249) { - this.params = AbstractIndexCache.readStringIntParameters(var1, this.params); + this.params = AbstractArchive.readStringIntParameters(var1, this.params); } } @@ -484,21 +487,22 @@ public class ItemDefinition extends DualNode { signature = "(Ljv;Ljv;I)V", garbageValue = "2051877377" ) - void method140(ItemDefinition var1, ItemDefinition var2) { - this.field435 = var1.field435; - this.zoom2d = var1.zoom2d; - this.xan2d = var1.xan2d; - this.yan2d = var1.yan2d; - this.zan2d = var1.zan2d; - this.offsetX2d = var1.offsetX2d; - this.offsetY2d = var1.offsetY2d; - this.recolorFrom = var1.recolorFrom; - this.recolorTo = var1.recolorTo; - this.retextureFrom = var1.retextureFrom; - this.retextureTo = var1.retextureTo; - this.name = var2.name; - this.isMembersOnly = var2.isMembersOnly; - this.price = var2.price; + @Export("genCert") + void genCert(ItemDefinition template, ItemDefinition link) { + this.model = template.model; + this.zoom2d = template.zoom2d; + this.xan2d = template.xan2d; + this.yan2d = template.yan2d; + this.zan2d = template.zan2d; + this.offsetX2d = template.offsetX2d; + this.offsetY2d = template.offsetY2d; + this.recolorFrom = template.recolorFrom; + this.recolorTo = template.recolorTo; + this.retextureFrom = template.retextureFrom; + this.retextureTo = template.retextureTo; + this.name = link.name; + this.isMembersOnly = link.isMembersOnly; + this.price = link.price; this.isStackable = 1; } @@ -507,37 +511,38 @@ public class ItemDefinition extends DualNode { signature = "(Ljv;Ljv;I)V", garbageValue = "227754762" ) - void method141(ItemDefinition var1, ItemDefinition var2) { - this.field435 = var1.field435; - this.zoom2d = var1.zoom2d; - this.xan2d = var1.xan2d; - this.yan2d = var1.yan2d; - this.zan2d = var1.zan2d; - this.offsetX2d = var1.offsetX2d; - this.offsetY2d = var1.offsetY2d; - this.recolorFrom = var2.recolorFrom; - this.recolorTo = var2.recolorTo; - this.retextureFrom = var2.retextureFrom; - this.retextureTo = var2.retextureTo; - this.name = var2.name; - this.isMembersOnly = var2.isMembersOnly; - this.isStackable = var2.isStackable; - this.maleModel = var2.maleModel; - this.maleModel1 = var2.maleModel1; - this.maleModel2 = var2.maleModel2; - this.femaleModel = var2.femaleModel; - this.femaleModel1 = var2.femaleModel1; - this.femaleModel2 = var2.femaleModel2; - this.maleHeadModel = var2.maleHeadModel; - this.maleHeadModel2 = var2.maleHeadModel2; - this.femaleHeadModel = var2.femaleHeadModel; - this.femaleHeadModel2 = var2.femaleHeadModel2; - this.int1 = var2.int1; - this.groundActions = var2.groundActions; + @Export("genBought") + void genBought(ItemDefinition template, ItemDefinition link) { + this.model = template.model; + this.zoom2d = template.zoom2d; + this.xan2d = template.xan2d; + this.yan2d = template.yan2d; + this.zan2d = template.zan2d; + this.offsetX2d = template.offsetX2d; + this.offsetY2d = template.offsetY2d; + this.recolorFrom = link.recolorFrom; + this.recolorTo = link.recolorTo; + this.retextureFrom = link.retextureFrom; + this.retextureTo = link.retextureTo; + this.name = link.name; + this.isMembersOnly = link.isMembersOnly; + this.isStackable = link.isStackable; + this.maleModel = link.maleModel; + this.maleModel1 = link.maleModel1; + this.maleModel2 = link.maleModel2; + this.femaleModel = link.femaleModel; + this.femaleModel1 = link.femaleModel1; + this.femaleModel2 = link.femaleModel2; + this.maleHeadModel = link.maleHeadModel; + this.maleHeadModel2 = link.maleHeadModel2; + this.femaleHeadModel = link.femaleHeadModel; + this.femaleHeadModel2 = link.femaleHeadModel2; + this.team = link.team; + this.groundActions = link.groundActions; this.inventoryActions = new String[5]; - if (var2.inventoryActions != null) { + if (link.inventoryActions != null) { for (int var3 = 0; var3 < 4; ++var3) { - this.inventoryActions[var3] = var2.inventoryActions[var3]; + this.inventoryActions[var3] = link.inventoryActions[var3]; } } @@ -550,20 +555,21 @@ public class ItemDefinition extends DualNode { signature = "(Ljv;Ljv;I)V", garbageValue = "2084647027" ) - void method142(ItemDefinition var1, ItemDefinition var2) { - this.field435 = var1.field435; - this.zoom2d = var1.zoom2d; - this.xan2d = var1.xan2d; - this.yan2d = var1.yan2d; - this.zan2d = var1.zan2d; - this.offsetX2d = var1.offsetX2d; - this.offsetY2d = var1.offsetY2d; - this.recolorFrom = var1.recolorFrom; - this.recolorTo = var1.recolorTo; - this.retextureFrom = var1.retextureFrom; - this.retextureTo = var1.retextureTo; - this.isStackable = var1.isStackable; - this.name = var2.name; + @Export("genPlaceholder") + void genPlaceholder(ItemDefinition template, ItemDefinition link) { + this.model = template.model; + this.zoom2d = template.zoom2d; + this.xan2d = template.xan2d; + this.yan2d = template.yan2d; + this.zan2d = template.zan2d; + this.offsetX2d = template.offsetX2d; + this.offsetY2d = template.offsetY2d; + this.recolorFrom = template.recolorFrom; + this.recolorTo = template.recolorTo; + this.retextureFrom = template.retextureFrom; + this.retextureTo = template.retextureTo; + this.isStackable = template.isStackable; + this.name = link.name; this.price = 0; this.isMembersOnly = false; this.isTradable = false; @@ -576,12 +582,12 @@ public class ItemDefinition extends DualNode { ) public final ModelData method143(int var1) { int var2; - if (this.field436 != null && var1 > 1) { + if (this.countobj != null && var1 > 1) { int var3 = -1; for (var2 = 0; var2 < 10; ++var2) { - if (var1 >= this.field437[var2] && this.field437[var2] != 0) { - var3 = this.field436[var2]; + if (var1 >= this.countco[var2] && this.countco[var2] != 0) { + var3 = this.countobj[var2]; } } @@ -590,7 +596,7 @@ public class ItemDefinition extends DualNode { } } - ModelData var4 = ModelData.method2788(ItemDefinition_modelIndexCache, this.field435, 0); + ModelData var4 = ModelData.method2788(ItemDefinition_modelArchive, this.model, 0); if (var4 == null) { return null; } else { @@ -620,13 +626,13 @@ public class ItemDefinition extends DualNode { garbageValue = "1152916563" ) @Export("getModel") - public final Model getModel(int var1) { - if (this.field436 != null && var1 > 1) { + public final Model getModel(int quantity) { + if (this.countobj != null && quantity > 1) { int var2 = -1; for (int var3 = 0; var3 < 10; ++var3) { - if (var1 >= this.field437[var3] && this.field437[var3] != 0) { - var2 = this.field436[var3]; + if (quantity >= this.countco[var3] && this.countco[var3] != 0) { + var2 = this.countobj[var3]; } } @@ -639,7 +645,7 @@ public class ItemDefinition extends DualNode { if (var5 != null) { return var5; } else { - ModelData var6 = ModelData.method2788(ItemDefinition_modelIndexCache, this.field435, 0); + ModelData var6 = ModelData.method2788(ItemDefinition_modelArchive, this.model, 0); if (var6 == null) { return null; } else { @@ -673,13 +679,14 @@ public class ItemDefinition extends DualNode { signature = "(IB)Ljv;", garbageValue = "0" ) - public ItemDefinition method144(int var1) { - if (this.field436 != null && var1 > 1) { + @Export("getCountObj") + public ItemDefinition getCountObj(int quantity) { + if (this.countobj != null && quantity > 1) { int var2 = -1; for (int var3 = 0; var3 < 10; ++var3) { - if (var1 >= this.field437[var3] && this.field437[var3] != 0) { - var2 = this.field436[var3]; + if (quantity >= this.countco[var3] && this.countco[var3] != 0) { + var2 = this.countobj[var3]; } } @@ -710,15 +717,15 @@ public class ItemDefinition extends DualNode { return true; } else { boolean var5 = true; - if (!ItemDefinition_modelIndexCache.tryLoadRecord(var2, 0)) { + if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { var5 = false; } - if (var3 != -1 && !ItemDefinition_modelIndexCache.tryLoadRecord(var3, 0)) { + if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { var5 = false; } - if (var4 != -1 && !ItemDefinition_modelIndexCache.tryLoadRecord(var4, 0)) { + if (var4 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { var5 = false; } @@ -744,11 +751,11 @@ public class ItemDefinition extends DualNode { if (var2 == -1) { return null; } else { - ModelData var5 = ModelData.method2788(ItemDefinition_modelIndexCache, var2, 0); + ModelData var5 = ModelData.method2788(ItemDefinition_modelArchive, var2, 0); if (var3 != -1) { - ModelData var6 = ModelData.method2788(ItemDefinition_modelIndexCache, var3, 0); + ModelData var6 = ModelData.method2788(ItemDefinition_modelArchive, var3, 0); if (var4 != -1) { - ModelData var7 = ModelData.method2788(ItemDefinition_modelIndexCache, var4, 0); + ModelData var7 = ModelData.method2788(ItemDefinition_modelArchive, var4, 0); ModelData[] var8 = new ModelData[]{var5, var6, var7}; var5 = new ModelData(var8, 3); } else { @@ -799,11 +806,11 @@ public class ItemDefinition extends DualNode { return true; } else { boolean var4 = true; - if (!ItemDefinition_modelIndexCache.tryLoadRecord(var2, 0)) { + if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { var4 = false; } - if (var3 != -1 && !ItemDefinition_modelIndexCache.tryLoadRecord(var3, 0)) { + if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { var4 = false; } @@ -827,9 +834,9 @@ public class ItemDefinition extends DualNode { if (var2 == -1) { return null; } else { - ModelData var4 = ModelData.method2788(ItemDefinition_modelIndexCache, var2, 0); + ModelData var4 = ModelData.method2788(ItemDefinition_modelArchive, var2, 0); if (var3 != -1) { - ModelData var5 = ModelData.method2788(ItemDefinition_modelIndexCache, var3, 0); + ModelData var5 = ModelData.method2788(ItemDefinition_modelArchive, var3, 0); ModelData[] var6 = new ModelData[]{var4, var5}; var4 = new ModelData(var6, 2); } @@ -891,7 +898,7 @@ public class ItemDefinition extends DualNode { ) @Export("getShiftClickIndex") public int getShiftClickIndex() { - return this.shiftClickIndex0 != -1 && this.inventoryActions != null ? (this.shiftClickIndex0 >= 0 ? (this.inventoryActions[this.shiftClickIndex0] != null ? this.shiftClickIndex0 : -1) : ("Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1)) : -1; + return this.shiftClickIndex != -1 && this.inventoryActions != null ? (this.shiftClickIndex >= 0 ? (this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex : -1) : ("Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1)) : -1; } static { diff --git a/runescape-client/src/main/java/IterableNodeDeque.java b/runescape-client/src/main/java/IterableNodeDeque.java index 153160f944..f916f30966 100644 --- a/runescape-client/src/main/java/IterableNodeDeque.java +++ b/runescape-client/src/main/java/IterableNodeDeque.java @@ -40,15 +40,15 @@ public class IterableNodeDeque implements Iterable { signature = "(Lgw;)V" ) @Export("addFirst") - public void addFirst(Node var1) { - if (var1.next != null) { - var1.remove(); + public void addFirst(Node node) { + if (node.next != null) { + node.remove(); } - var1.next = this.sentinel.next; - var1.previous = this.sentinel; - var1.next.previous = var1; - var1.previous.next = var1; + node.next = this.sentinel.next; + node.previous = this.sentinel; + node.next.previous = node; + node.previous.next = node; } @ObfuscatedName("q") @@ -56,15 +56,15 @@ public class IterableNodeDeque implements Iterable { signature = "(Lgw;)V" ) @Export("addLast") - public void addLast(Node var1) { - if (var1.next != null) { - var1.remove(); + public void addLast(Node node) { + if (node.next != null) { + node.remove(); } - var1.next = this.sentinel; - var1.previous = this.sentinel.previous; - var1.next.previous = var1; - var1.previous.next = var1; + node.next = this.sentinel; + node.previous = this.sentinel.previous; + node.next.previous = node; + node.previous.next = node; } @ObfuscatedName("o") @@ -81,12 +81,12 @@ public class IterableNodeDeque implements Iterable { signature = "(Lgw;)Lgw;" ) @Export("previousOrLast") - Node previousOrLast(Node var1) { + Node previousOrLast(Node node) { Node var2; - if (var1 == null) { + if (node == null) { var2 = this.sentinel.previous; } else { - var2 = var1; + var2 = node; } if (var2 == this.sentinel) { @@ -131,14 +131,14 @@ public class IterableNodeDeque implements Iterable { signature = "(Lgw;Lgw;)V" ) @Export("IterableNodeDeque_addBefore") - public static void IterableNodeDeque_addBefore(Node var0, Node var1) { - if (var0.next != null) { - var0.remove(); + public static void IterableNodeDeque_addBefore(Node node, Node old) { + if (node.next != null) { + node.remove(); } - var0.next = var1; - var0.previous = var1.previous; - var0.next.previous = var0; - var0.previous.next = var0; + node.next = old; + node.previous = old.previous; + node.next.previous = node; + node.previous.next = node; } } diff --git a/runescape-client/src/main/java/IterableNodeHashTable.java b/runescape-client/src/main/java/IterableNodeHashTable.java index 93cecb53a0..c56d9b9e2f 100644 --- a/runescape-client/src/main/java/IterableNodeHashTable.java +++ b/runescape-client/src/main/java/IterableNodeHashTable.java @@ -125,15 +125,16 @@ public final class IterableNodeHashTable implements Iterable { this.current = var1.previous; return var1; } else { - while (this.index < this.size) { - var1 = this.buckets[this.index++].previous; - if (var1 != this.buckets[this.index - 1]) { - this.current = var1.previous; - return var1; + do { + if (this.index >= this.size) { + return null; } - } - return null; + var1 = this.buckets[this.index++].previous; + } while(var1 == this.buckets[this.index - 1]); + + this.current = var1.previous; + return var1; } } diff --git a/runescape-client/src/main/java/IterableNodeHashTableIterator.java b/runescape-client/src/main/java/IterableNodeHashTableIterator.java index 717dff1c35..3fc7468142 100644 --- a/runescape-client/src/main/java/IterableNodeHashTableIterator.java +++ b/runescape-client/src/main/java/IterableNodeHashTableIterator.java @@ -56,16 +56,17 @@ public class IterableNodeHashTableIterator implements Iterator { this.last = var1; return var1; } else { - while (this.index < this.hashTable.size) { - var1 = this.hashTable.buckets[this.index++].previous; - if (var1 != this.hashTable.buckets[this.index - 1]) { - this.head = var1.previous; - this.last = var1; - return var1; + do { + if (this.index >= this.hashTable.size) { + return null; } - } - return null; + var1 = this.hashTable.buckets[this.index++].previous; + } while(var1 == this.hashTable.buckets[this.index - 1]); + + this.head = var1.previous; + this.last = var1; + return var1; } } diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java index 619b4d5fa9..2aac8708a3 100644 --- a/runescape-client/src/main/java/KitDefinition.java +++ b/runescape-client/src/main/java/KitDefinition.java @@ -11,13 +11,13 @@ public class KitDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("KitDefinition_indexCache") - public static AbstractIndexCache KitDefinition_indexCache; + @Export("KitDefinition_archive") + public static AbstractArchive KitDefinition_archive; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field456; + public static AbstractArchive field456; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 235389995 @@ -36,8 +36,8 @@ public class KitDefinition extends DualNode { @Export("bodypartID") public int bodypartID; @ObfuscatedName("u") - @Export("modelIDs") - int[] modelIDs; + @Export("models2") + int[] models2; @ObfuscatedName("g") @Export("recolorFrom") short[] recolorFrom; @@ -51,15 +51,15 @@ public class KitDefinition extends DualNode { @Export("retextureTo") short[] retextureTo; @ObfuscatedName("d") - @Export("archives") - int[] archives; + @Export("models") + int[] models; @ObfuscatedName("k") @Export("nonSelectable") public boolean nonSelectable; KitDefinition() { this.bodypartID = -1; - this.archives = new int[]{-1, -1, -1, -1, -1}; + this.models = new int[]{-1, -1, -1, -1, -1}; this.nonSelectable = false; } @@ -68,15 +68,15 @@ public class KitDefinition extends DualNode { signature = "(Lgr;S)V", garbageValue = "22753" ) - @Export("read") - void read(Buffer var1) { + @Export("decode") + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -85,8 +85,8 @@ public class KitDefinition extends DualNode { signature = "(Lgr;II)V", garbageValue = "-1828581673" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { if (var2 == 1) { this.bodypartID = var1.readUnsignedByte(); } else { @@ -94,10 +94,10 @@ public class KitDefinition extends DualNode { int var4; if (var2 == 2) { var3 = var1.readUnsignedByte(); - this.modelIDs = new int[var3]; + this.models2 = new int[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.modelIDs[var4] = var1.readUnsignedShort(); + this.models2[var4] = var1.readUnsignedShort(); } } else if (var2 == 3) { this.nonSelectable = true; @@ -120,7 +120,7 @@ public class KitDefinition extends DualNode { this.retextureTo[var4] = (short)var1.readUnsignedShort(); } } else if (var2 >= 60 && var2 < 70) { - this.archives[var2 - 60] = var1.readUnsignedShort(); + this.models[var2 - 60] = var1.readUnsignedShort(); } } @@ -133,13 +133,13 @@ public class KitDefinition extends DualNode { ) @Export("ready") public boolean ready() { - if (this.modelIDs == null) { + if (this.models2 == null) { return true; } else { boolean var1 = true; - for (int var2 = 0; var2 < this.modelIDs.length; ++var2) { - if (!field456.tryLoadRecord(this.modelIDs[var2], 0)) { + for (int var2 = 0; var2 < this.models2.length; ++var2) { + if (!field456.tryLoadFile(this.models2[var2], 0)) { var1 = false; } } @@ -155,13 +155,13 @@ public class KitDefinition extends DualNode { ) @Export("getModelData") public ModelData getModelData() { - if (this.modelIDs == null) { + if (this.models2 == null) { return null; } else { - ModelData[] var1 = new ModelData[this.modelIDs.length]; + ModelData[] var1 = new ModelData[this.models2.length]; - for (int var2 = 0; var2 < this.modelIDs.length; ++var2) { - var1[var2] = ModelData.method2788(field456, this.modelIDs[var2], 0); + for (int var2 = 0; var2 < this.models2.length; ++var2) { + var1[var2] = ModelData.method2788(field456, this.models2[var2], 0); } ModelData var4; @@ -197,7 +197,7 @@ public class KitDefinition extends DualNode { boolean var1 = true; for (int var2 = 0; var2 < 5; ++var2) { - if (this.archives[var2] != -1 && !field456.tryLoadRecord(this.archives[var2], 0)) { + if (this.models[var2] != -1 && !field456.tryLoadFile(this.models[var2], 0)) { var1 = false; } } @@ -215,8 +215,8 @@ public class KitDefinition extends DualNode { int var2 = 0; for (int var3 = 0; var3 < 5; ++var3) { - if (this.archives[var3] != -1) { - var1[var2++] = ModelData.method2788(field456, this.archives[var3], 0); + if (this.models[var3] != -1) { + var1[var2++] = ModelData.method2788(field456, this.models[var3], 0); } } @@ -252,7 +252,7 @@ public class KitDefinition extends DualNode { byte[] var3 = new byte[var2]; var0.index += class303.huffman.method128(var0.array, var0.index, var3, 0, var2); - String var4 = WidgetGroupParent.decodeStringCp1252(var3, 0, var2); + String var4 = InterfaceParent.decodeStringCp1252(var3, 0, var2); var1 = var4; } catch (Exception var5) { var1 = "Cabbage"; diff --git a/runescape-client/src/main/java/Login.java b/runescape-client/src/main/java/Login.java index 646b5a23a1..ef1fbe61a1 100644 --- a/runescape-client/src/main/java/Login.java +++ b/runescape-client/src/main/java/Login.java @@ -139,16 +139,16 @@ public class Login { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache11") - static IndexCache indexCache11; + @Export("archive11") + static Archive archive11; @ObfuscatedName("m") @ObfuscatedSignature( signature = "(Lir;II)Lhl;", garbageValue = "-1625685874" ) - static MusicPatch method2045(AbstractIndexCache var0, int var1) { - byte[] var2 = var0.takeRecordFlat(var1); + static MusicPatch method2045(AbstractArchive var0, int var1) { + byte[] var2 = var0.takeFileFlat(var1); return var2 == null ? null : new MusicPatch(var2); } @@ -186,10 +186,10 @@ public class Login { signature = "(Lir;IIIZB)V", garbageValue = "45" ) - public static void method2076(AbstractIndexCache var0, int var1, int var2, int var3, boolean var4) { + public static void method2076(AbstractArchive var0, int var1, int var2, int var3, boolean var4) { class214.field1129 = 1; class214.field1130 = var0; - class30.musicTrackArchiveId = var1; + class30.musicTrackGroupId = var1; GrandExchangeOffer.musicTrackFileId = var2; WorldMapLabel.field1039 = var3; RectangleMode.musicTrackBoolean = var4; @@ -205,8 +205,8 @@ public class Login { if (ReflectionCheck.clientPreferences.roofsHidden) { return SoundSystem.plane; } else { - int var0 = class32.getTileHeight(WorldMapSection1.cameraX, class11.cameraZ, SoundSystem.plane); - return var0 - GrandExchangeEvents.cameraY < 800 && (Tiles.Tiles_renderFlags[SoundSystem.plane][WorldMapSection1.cameraX >> 7][class11.cameraZ >> 7] & 4) != 0 ? SoundSystem.plane : 3; + int var0 = class32.getTileHeight(WorldMapSection1.cameraX, GrandExchangeOfferNameComparator.cameraZ, SoundSystem.plane); + return var0 - GrandExchangeEvents.cameraY < 800 && (Tiles.Tiles_renderFlags[SoundSystem.plane][WorldMapSection1.cameraX >> 7][GrandExchangeOfferNameComparator.cameraZ >> 7] & 4) != 0 ? SoundSystem.plane : 3; } } diff --git a/runescape-client/src/main/java/LoginScreenAnimation.java b/runescape-client/src/main/java/LoginScreenAnimation.java index 6d73e2b166..6171060b16 100644 --- a/runescape-client/src/main/java/LoginScreenAnimation.java +++ b/runescape-client/src/main/java/LoginScreenAnimation.java @@ -510,7 +510,7 @@ public class LoginScreenAnimation { Varps.method4400(var5); var5.writeLong(var3.nextLong()); var5.encryptRsa(class80.field1163, class80.field1164); - var7 = WorldMapRegion.method550(var2); + var7 = WorldMapRegion.stringCp1252NullTerminatedByteSize(var2); if (var7 % 8 != 0) { var7 += 8 - var7 % 8; } @@ -587,7 +587,7 @@ public class LoginScreenAnimation { var19 = new String(var9.array, 0, var9.index); if (class83.method2026(var19)) { - WorldMapCacheName.method635(var19, true, false); + WorldMapCacheName.openURL(var19, true, false); return 2; } else { return 5; @@ -616,10 +616,10 @@ public class LoginScreenAnimation { if (var1 != null) { return var1; } else { - byte[] var2 = HitSplatDefinition.field382.takeRecord(32, var0); + byte[] var2 = HitSplatDefinition.field382.takeFile(32, var0); var1 = new HitSplatDefinition(); if (var2 != null) { - var1.read(new Buffer(var2)); + var1.decode(new Buffer(var2)); } HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); diff --git a/runescape-client/src/main/java/LoginType.java b/runescape-client/src/main/java/LoginType.java index c00ed82f4c..88c8325bc5 100644 --- a/runescape-client/src/main/java/LoginType.java +++ b/runescape-client/src/main/java/LoginType.java @@ -72,8 +72,7 @@ public class LoginType { this.field489 = var4; } - @ObfuscatedName("toString") - public String method166() { + public String toString() { return this.field489; } diff --git a/runescape-client/src/main/java/MenuAction.java b/runescape-client/src/main/java/MenuAction.java index 7dea34d004..4712119a3f 100644 --- a/runescape-client/src/main/java/MenuAction.java +++ b/runescape-client/src/main/java/MenuAction.java @@ -47,9 +47,9 @@ public class MenuAction { garbageValue = "0" ) @Export("loadIndexedSpriteByName") - public static IndexedSprite loadIndexedSpriteByName(AbstractIndexCache var0, String var1, String var2) { - int var3 = var0.getArchiveId(var1); - int var4 = var0.getRecordId(var3, var2); + public static IndexedSprite loadIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); + int var4 = var0.getFileId(var3, var2); IndexedSprite var5; if (!SpriteMask.loadSprite(var0, var3, var4)) { var5 = null; @@ -65,13 +65,13 @@ public class MenuAction { signature = "(Lbx;ZI)V", garbageValue = "1537219807" ) - @Export("closeWidgetGroup") - static final void closeWidgetGroup(WidgetGroupParent var0, boolean var1) { + @Export("closeInterface") + static final void closeInterface(InterfaceParent var0, boolean var1) { int var2 = var0.group; int var3 = (int)var0.key; var0.remove(); if (var1) { - AbstractByteArrayCopier.unloadWidgetGroup(var2); + AbstractByteArrayCopier.unloadInterface(var2); } for (IntegerNode var4 = (IntegerNode)Client.widgetClickMasks.first(); var4 != null; var4 = (IntegerNode)Client.widgetClickMasks.next()) { @@ -152,8 +152,8 @@ public class MenuAction { GameShell.menuY = var14; class214.menuWidth = var7; AbstractWorldMapIcon.menuHeight = Client.menuOptionsCount * 15 + 22; - if (Client.rootWidgetGroup != -1) { - GrandExchangeEvents.method74(Client.rootWidgetGroup, 1); + if (Client.rootInterface != -1) { + GrandExchangeEvents.method74(Client.rootInterface, 1); } } diff --git a/runescape-client/src/main/java/Message.java b/runescape-client/src/main/java/Message.java index 30ac47dfcb..4c64860070 100644 --- a/runescape-client/src/main/java/Message.java +++ b/runescape-client/src/main/java/Message.java @@ -67,15 +67,15 @@ public class Message extends DualNode { garbageValue = "0" ) @Export("set") - void set(int var1, String var2, String var3, String var4) { + void set(int type, String sender, String prefix, String text) { int var5 = ++Messages.Messages_count - 1; this.count = var5; this.cycle = Client.cycle; - this.type = var1; - this.sender = var2; + this.type = type; + this.sender = sender; this.fillSenderUsername(); - this.prefix = var3; - this.text = var4; + this.prefix = prefix; + this.text = text; this.clearIsFromFriend(); this.clearIsFromIgnored(); } @@ -221,7 +221,7 @@ public class Message extends DualNode { } else if (VarcInt.isAlphaNumeric(var10)) { var11 = true; } else { - label149: { + label151: { char[] var12 = class305.field1149; int var13; @@ -230,27 +230,21 @@ public class Message extends DualNode { var14 = var12[var13]; if (var10 == var14) { var11 = true; - break label149; + break label151; } } var12 = class305.field1150; - var13 = 0; - - while (true) { - if (var13 >= var12.length) { - var11 = false; - break; - } + for (var13 = 0; var13 < var12.length; ++var13) { var14 = var12[var13]; if (var10 == var14) { var11 = true; - break; + break label151; } - - ++var13; } + + var11 = false; } } @@ -376,7 +370,7 @@ public class Message extends DualNode { if (SoundSystem.plane != Client.field125) { Client.field125 = SoundSystem.plane; int var0 = SoundSystem.plane; - int[] var1 = WidgetGroupParent.sceneMinimapSprite.pixels; + int[] var1 = InterfaceParent.sceneMinimapSprite.pixels; int var2 = var1.length; int var3; @@ -404,7 +398,7 @@ public class Message extends DualNode { var3 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); var4 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; - WidgetGroupParent.sceneMinimapSprite.setRaster(); + InterfaceParent.sceneMinimapSprite.setRaster(); int var6; for (var5 = 1; var5 < 103; ++var5) { @@ -467,6 +461,6 @@ public class Message extends DualNode { } String var4 = "runescape.com"; - return var2 + var0 + "." + var4 + "/l=" + Client.language + "/a=" + AbstractIndexCache.field2 + var3 + "/"; + return var2 + var0 + "." + var4 + "/l=" + Client.language + "/a=" + AbstractArchive.field2 + var3 + "/"; } } diff --git a/runescape-client/src/main/java/MidiFileReader.java b/runescape-client/src/main/java/MidiFileReader.java index 5998804d6f..7abeab23ee 100644 --- a/runescape-client/src/main/java/MidiFileReader.java +++ b/runescape-client/src/main/java/MidiFileReader.java @@ -44,33 +44,33 @@ public class MidiFileReader { @ObfuscatedName("m") @Export("parse") - void parse(byte[] var1) { - this.buffer.array = var1; + void parse(byte[] midi) { + this.buffer.array = midi; this.buffer.index = 10; int var2 = this.buffer.readUnsignedShort(); this.division = this.buffer.readUnsignedShort(); this.field493 = 500000; this.trackStarts = new int[var2]; - Buffer var10000; - int var3; + Buffer var3; int var4; - for (var3 = 0; var3 < var2; var10000.index += var4) { - int var5 = this.buffer.readInt(); - var4 = this.buffer.readInt(); - if (var5 == 1297379947) { - this.trackStarts[var3] = this.buffer.index; - ++var3; + int var5; + for (var4 = 0; var4 < var2; var3.index += var5) { + int var6 = this.buffer.readInt(); + var5 = this.buffer.readInt(); + if (var6 == 1297379947) { + this.trackStarts[var4] = this.buffer.index; + ++var4; } - var10000 = this.buffer; + var3 = this.buffer; } this.field494 = 0L; this.trackPositions = new int[var2]; - for (var3 = 0; var3 < var2; ++var3) { - this.trackPositions[var3] = this.trackStarts[var3]; + for (var4 = 0; var4 < var2; ++var4) { + this.trackPositions[var4] = this.trackStarts[var4]; } this.trackLengths = new int[var2]; @@ -101,14 +101,14 @@ public class MidiFileReader { @ObfuscatedName("o") @Export("gotoTrack") - void gotoTrack(int var1) { - this.buffer.index = this.trackPositions[var1]; + void gotoTrack(int trackId) { + this.buffer.index = this.trackPositions[trackId]; } @ObfuscatedName("u") @Export("markTrackPosition") - void markTrackPosition(int var1) { - this.trackPositions[var1] = this.buffer.index; + void markTrackPosition(int trackId) { + this.trackPositions[trackId] = this.buffer.index; } @ObfuscatedName("g") @@ -119,47 +119,47 @@ public class MidiFileReader { @ObfuscatedName("l") @Export("readTrackLength") - void readTrackLength(int var1) { + void readTrackLength(int trackId) { int var2 = this.buffer.method52(); - int[] var10000 = this.trackLengths; - var10000[var1] += var2; + int[] var3 = this.trackLengths; + var3[trackId] += var2; } @ObfuscatedName("e") @Export("readMessage") - int readMessage(int var1) { - int var2 = this.readMessage0(var1); + int readMessage(int trackId) { + int var2 = this.readMessage0(trackId); return var2; } @ObfuscatedName("x") @Export("readMessage0") - int readMessage0(int var1) { + int readMessage0(int trackId) { byte var2 = this.buffer.array[this.buffer.index]; int var3; if (var2 < 0) { var3 = var2 & 255; - this.field492[var1] = var3; + this.field492[trackId] = var3; ++this.buffer.index; } else { - var3 = this.field492[var1]; + var3 = this.field492[trackId]; } if (var3 != 240 && var3 != 247) { - return this.method167(var1, var3); + return this.method167(trackId, var3); } else { int var4 = this.buffer.method52(); if (var3 == 247 && var4 > 0) { int var5 = this.buffer.array[this.buffer.index] & 255; if (var5 >= 241 && var5 <= 243 || var5 == 246 || var5 == 248 || var5 >= 250 && var5 <= 252 || var5 == 254) { ++this.buffer.index; - this.field492[var1] = var5; - return this.method167(var1, var5); + this.field492[trackId] = var5; + return this.method167(trackId, var5); } } - Buffer var10000 = this.buffer; - var10000.index += var4; + Buffer var6 = this.buffer; + var6.index += var4; return 0; } } @@ -168,25 +168,25 @@ public class MidiFileReader { int method167(int var1, int var2) { int var3; if (var2 == 255) { - int var7 = this.buffer.readUnsignedByte(); + int var8 = this.buffer.readUnsignedByte(); var3 = this.buffer.method52(); - Buffer var10000; - if (var7 == 47) { - var10000 = this.buffer; - var10000.index += var3; + Buffer var5; + if (var8 == 47) { + var5 = this.buffer; + var5.index += var3; return 1; - } else if (var7 == 81) { - int var5 = this.buffer.readMedium(); + } else if (var8 == 81) { + int var6 = this.buffer.readMedium(); var3 -= 3; - int var6 = this.trackLengths[var1]; - this.field494 += (long)var6 * (long)(this.field493 - var5); - this.field493 = var5; - var10000 = this.buffer; - var10000.index += var3; + int var7 = this.trackLengths[var1]; + this.field494 += (long)var7 * (long)(this.field493 - var6); + this.field493 = var6; + var5 = this.buffer; + var5.index += var3; return 2; } else { - var10000 = this.buffer; - var10000.index += var3; + var5 = this.buffer; + var5.index += var3; return 3; } } else { diff --git a/runescape-client/src/main/java/MidiPcmStream.java b/runescape-client/src/main/java/MidiPcmStream.java index eec4788edf..e7abdefd73 100644 --- a/runescape-client/src/main/java/MidiPcmStream.java +++ b/runescape-client/src/main/java/MidiPcmStream.java @@ -150,15 +150,15 @@ public class MidiPcmStream extends PcmStream { garbageValue = "-324121369" ) @Export("loadMusicTrack") - public synchronized boolean loadMusicTrack(MusicTrack var1, AbstractIndexCache var2, SoundCache var3, int var4) { - var1.method226(); + public synchronized boolean loadMusicTrack(MusicTrack musicTrack, AbstractArchive var2, SoundCache var3, int frequency) { + musicTrack.method226(); boolean var5 = true; int[] var6 = null; - if (var4 > 0) { - var6 = new int[]{var4}; + if (frequency > 0) { + var6 = new int[]{frequency}; } - for (ByteArrayNode var7 = (ByteArrayNode)var1.table.first(); var7 != null; var7 = (ByteArrayNode)var1.table.next()) { + for (ByteArrayNode var7 = (ByteArrayNode)musicTrack.table.first(); var7 != null; var7 = (ByteArrayNode)musicTrack.table.next()) { int var8 = (int)var7.key; MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)var8); if (var9 == null) { @@ -177,7 +177,7 @@ public class MidiPcmStream extends PcmStream { } if (var5) { - var1.clear(); + musicTrack.clear(); } return var5; @@ -233,7 +233,8 @@ public class MidiPcmStream extends PcmStream { } @ObfuscatedName("e") - protected synchronized void vmethod263(int[] var1, int var2, int var3) { + @Export("fill") + protected synchronized void fill(int[] var1, int var2, int var3) { if (this.midiFile.isReady()) { int var4 = this.midiFile.division * this.field496 / class309.PcmPlayer_sampleRate; @@ -246,14 +247,14 @@ public class MidiPcmStream extends PcmStream { int var7 = (int)(((long)var4 + (this.field516 - this.field515) - 1L) / (long)var4); this.field515 += (long)var4 * (long)var7; - this.patchStream.vmethod263(var1, var2, var7); + this.patchStream.fill(var1, var2, var7); var2 += var7; var3 -= var7; this.method194(); } while(this.midiFile.isReady()); } - this.patchStream.vmethod263(var1, var2, var3); + this.patchStream.fill(var1, var2, var3); } @ObfuscatedName("x") @@ -262,9 +263,9 @@ public class MidiPcmStream extends PcmStream { garbageValue = "-1859383102" ) @Export("setMusicTrack") - public synchronized void setMusicTrack(MusicTrack var1, boolean var2) { + public synchronized void setMusicTrack(MusicTrack musicTrack, boolean var2) { this.clear(); - this.midiFile.parse(var1.midi); + this.midiFile.parse(musicTrack.midi); this.field514 = var2; this.field515 = 0L; int var3 = this.midiFile.trackCount(); @@ -281,7 +282,8 @@ public class MidiPcmStream extends PcmStream { } @ObfuscatedName("d") - protected synchronized void vmethod264(int var1) { + @Export("skip") + protected synchronized void skip(int var1) { if (this.midiFile.isReady()) { int var2 = this.midiFile.division * this.field496 / class309.PcmPlayer_sampleRate; @@ -294,13 +296,13 @@ public class MidiPcmStream extends PcmStream { int var5 = (int)(((long)var2 + (this.field516 - this.field515) - 1L) / (long)var2); this.field515 += (long)var5 * (long)var2; - this.patchStream.vmethod264(var5); + this.patchStream.skip(var5); var1 -= var5; this.method194(); } while(this.midiFile.isReady()); } - this.patchStream.vmethod264(var1); + this.patchStream.skip(var1); } @ObfuscatedName("a") @@ -703,25 +705,25 @@ public class MidiPcmStream extends PcmStream { this.field499[var3] = var5 + (this.field499[var3] & -128); } - int[] var10000; + int[] var6; if (var4 == 64) { if (var5 >= 64) { - var10000 = this.field506; - var10000[var3] |= 1; + var6 = this.field506; + var6[var3] |= 1; } else { - var10000 = this.field506; - var10000[var3] &= -2; + var6 = this.field506; + var6[var3] &= -2; } } if (var4 == 65) { if (var5 >= 64) { - var10000 = this.field506; - var10000[var3] |= 2; + var6 = this.field506; + var6[var3] |= 2; } else { this.method187(var3); - var10000 = this.field506; - var10000[var3] &= -3; + var6 = this.field506; + var6[var3] &= -3; } } @@ -753,17 +755,17 @@ public class MidiPcmStream extends PcmStream { this.method185(var3); } - int var6; + int var7; if (var4 == 6) { - var6 = this.field507[var3]; - if (var6 == 16384) { + var7 = this.field507[var3]; + if (var7 == 16384) { this.field508[var3] = (var5 << 7) + (this.field508[var3] & -16257); } } if (var4 == 38) { - var6 = this.field507[var3]; - if (var6 == 16384) { + var7 = this.field507[var3]; + if (var7 == 16384) { this.field508[var3] = var5 + (this.field508[var3] & -128); } } @@ -778,12 +780,12 @@ public class MidiPcmStream extends PcmStream { if (var4 == 81) { if (var5 >= 64) { - var10000 = this.field506; - var10000[var3] |= 4; + var6 = this.field506; + var6[var3] |= 4; } else { this.method188(var3); - var10000 = this.field506; - var10000[var3] &= -5; + var6 = this.field506; + var6[var3] &= -5; } } @@ -1040,9 +1042,9 @@ public class MidiPcmStream extends PcmStream { if (var7) { var1.stream.method275(var1.field590); if (var2 != null) { - var1.stream.vmethod263(var2, var3, var4); + var1.stream.fill(var2, var3, var4); } else { - var1.stream.vmethod264(var4); + var1.stream.skip(var4); } if (var1.stream.method279()) { @@ -1079,13 +1081,13 @@ public class MidiPcmStream extends PcmStream { garbageValue = "30" ) @Export("PcmStream_disable") - static final void PcmStream_disable(PcmStream var0) { - var0.active = false; - if (var0.sound != null) { - var0.sound.position = 0; + static final void PcmStream_disable(PcmStream stream) { + stream.active = false; + if (stream.sound != null) { + stream.sound.position = 0; } - for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) { + for (PcmStream var1 = stream.firstSubStream(); var1 != null; var1 = stream.nextSubStream()) { PcmStream_disable(var1); } diff --git a/runescape-client/src/main/java/MilliClock.java b/runescape-client/src/main/java/MilliClock.java index 0693a0531c..8c7e5bb61e 100644 --- a/runescape-client/src/main/java/MilliClock.java +++ b/runescape-client/src/main/java/MilliClock.java @@ -73,7 +73,7 @@ public class MilliClock extends Clock { garbageValue = "-126803683" ) @Export("wait") - public int wait(int var1, int var2) { + public int wait(int cycleMs, int minSleepMs) { int var3 = this.field518; int var4 = this.field519; this.field518 = 300; @@ -83,7 +83,7 @@ public class MilliClock extends Clock { this.field518 = var3; this.field519 = var4; } else if (this.field520 > this.field517[this.field522]) { - this.field518 = (int)((long)(var1 * 2560) / (this.field520 - this.field517[this.field522])); + this.field518 = (int)((long)(cycleMs * 2560) / (this.field520 - this.field517[this.field522])); } if (this.field518 < 25) { @@ -92,11 +92,11 @@ public class MilliClock extends Clock { if (this.field518 > 256) { this.field518 = 256; - this.field519 = (int)((long)var1 - (this.field520 - this.field517[this.field522]) / 10L); + this.field519 = (int)((long)cycleMs - (this.field520 - this.field517[this.field522]) / 10L); } - if (this.field519 > var1) { - this.field519 = var1; + if (this.field519 > cycleMs) { + this.field519 = cycleMs; } this.field517[this.field522] = this.field520; @@ -105,14 +105,14 @@ public class MilliClock extends Clock { if (this.field519 > 1) { for (var5 = 0; var5 < 10; ++var5) { if (this.field517[var5] != 0L) { - long[] var10000 = this.field517; - var10000[var5] += (long)this.field519; + long[] var6 = this.field517; + var6[var5] += (long)this.field519; } } } - if (this.field519 < var2) { - this.field519 = var2; + if (this.field519 < minSleepMs) { + this.field519 = minSleepMs; } class203.method4010((long)this.field519); diff --git a/runescape-client/src/main/java/Model.java b/runescape-client/src/main/java/Model.java index 236da05475..337cb289dd 100644 --- a/runescape-client/src/main/java/Model.java +++ b/runescape-client/src/main/java/Model.java @@ -516,7 +516,7 @@ public class Model extends Entity { @ObfuscatedName("o") @Export("calculateBoundingBox") - void calculateBoundingBox(int var1) { + void calculateBoundingBox(int yaw) { if (this.xMidOffset == -1) { int var2 = 0; int var3 = 0; @@ -524,8 +524,8 @@ public class Model extends Entity { int var5 = 0; int var6 = 0; int var7 = 0; - int var8 = Model_cosine[var1]; - int var9 = Model_sine[var1]; + int var8 = Model_cosine[yaw]; + int var9 = Model_sine[yaw]; for (int var10 = 0; var10 < this.verticesCount; ++var10) { int var11 = Rasterizer3D.method3039(this.verticesX[var10], this.verticesZ[var10], var8, var9); @@ -653,9 +653,9 @@ public class Model extends Entity { signature = "(Len;I)V" ) @Export("animate") - public void animate(Frames var1, int var2) { - if (this.vertexLabels != null && var2 != -1) { - Animation var3 = var1.frames[var2]; + public void animate(Frames frames, int frame) { + if (this.vertexLabels != null && frame != -1) { + Animation var3 = frames.frames[frame]; Skeleton var4 = var3.skeleton; Model_transformTempX = 0; Model_transformTempY = 0; @@ -726,22 +726,23 @@ public class Model extends Entity { @ObfuscatedName("z") @Export("transform") - void transform(int var1, int[] var2, int var3, int var4, int var5) { - int var6 = var2.length; + void transform(int type, int[] labels, int var3, int var4, int var5) { + int var6 = labels.length; int var7; int var8; int var9; int var10; - if (var1 == 0) { + int[] var12; + if (type == 0) { var7 = 0; Model_transformTempX = 0; Model_transformTempY = 0; Model_transformTempZ = 0; for (var8 = 0; var8 < var6; ++var8) { - int var11 = var2[var8]; + int var11 = labels[var8]; if (var11 < this.vertexLabels.length) { - int[] var12 = this.vertexLabels[var11]; + var12 = this.vertexLabels[var11]; for (var9 = 0; var9 < var12.length; ++var9) { var10 = var12[var9]; @@ -763,113 +764,112 @@ public class Model extends Entity { Model_transformTempZ = var5; } } else { - int[] var10000; - int[] var18; - int var19; - if (var1 == 1) { + int var13; + int[] var19; + if (type == 1) { for (var7 = 0; var7 < var6; ++var7) { - var8 = var2[var7]; + var8 = labels[var7]; if (var8 < this.vertexLabels.length) { - var18 = this.vertexLabels[var8]; + var12 = this.vertexLabels[var8]; - for (var19 = 0; var19 < var18.length; ++var19) { - var9 = var18[var19]; - var10000 = this.verticesX; - var10000[var9] += var3; - var10000 = this.verticesY; - var10000[var9] += var4; - var10000 = this.verticesZ; - var10000[var9] += var5; + for (var13 = 0; var13 < var12.length; ++var13) { + var9 = var12[var13]; + var19 = this.verticesX; + var19[var9] += var3; + var19 = this.verticesY; + var19[var9] += var4; + var19 = this.verticesZ; + var19[var9] += var5; } } } - } else if (var1 == 2) { + } else if (type == 2) { for (var7 = 0; var7 < var6; ++var7) { - var8 = var2[var7]; + var8 = labels[var7]; if (var8 < this.vertexLabels.length) { - var18 = this.vertexLabels[var8]; + var12 = this.vertexLabels[var8]; - for (var19 = 0; var19 < var18.length; ++var19) { - var9 = var18[var19]; - var10000 = this.verticesX; - var10000[var9] -= Model_transformTempX; - var10000 = this.verticesY; - var10000[var9] -= Model_transformTempY; - var10000 = this.verticesZ; - var10000[var9] -= Model_transformTempZ; + for (var13 = 0; var13 < var12.length; ++var13) { + var9 = var12[var13]; + var19 = this.verticesX; + var19[var9] -= Model_transformTempX; + var19 = this.verticesY; + var19[var9] -= Model_transformTempY; + var19 = this.verticesZ; + var19[var9] -= Model_transformTempZ; var10 = (var3 & 255) * 8; - int var13 = (var4 & 255) * 8; - int var14 = (var5 & 255) * 8; - int var15; + int var14 = (var4 & 255) * 8; + int var15 = (var5 & 255) * 8; int var16; int var17; - if (var14 != 0) { - var15 = Model_sine[var14]; - var16 = Model_cosine[var14]; - var17 = var15 * this.verticesY[var9] + var16 * this.verticesX[var9] >> 16; - this.verticesY[var9] = var16 * this.verticesY[var9] - var15 * this.verticesX[var9] >> 16; - this.verticesX[var9] = var17; + int var18; + if (var15 != 0) { + var16 = Model_sine[var15]; + var17 = Model_cosine[var15]; + var18 = var16 * this.verticesY[var9] + var17 * this.verticesX[var9] >> 16; + this.verticesY[var9] = var17 * this.verticesY[var9] - var16 * this.verticesX[var9] >> 16; + this.verticesX[var9] = var18; } if (var10 != 0) { - var15 = Model_sine[var10]; - var16 = Model_cosine[var10]; - var17 = var16 * this.verticesY[var9] - var15 * this.verticesZ[var9] >> 16; - this.verticesZ[var9] = var15 * this.verticesY[var9] + var16 * this.verticesZ[var9] >> 16; - this.verticesY[var9] = var17; + var16 = Model_sine[var10]; + var17 = Model_cosine[var10]; + var18 = var17 * this.verticesY[var9] - var16 * this.verticesZ[var9] >> 16; + this.verticesZ[var9] = var16 * this.verticesY[var9] + var17 * this.verticesZ[var9] >> 16; + this.verticesY[var9] = var18; } - if (var13 != 0) { - var15 = Model_sine[var13]; - var16 = Model_cosine[var13]; - var17 = var15 * this.verticesZ[var9] + var16 * this.verticesX[var9] >> 16; - this.verticesZ[var9] = var16 * this.verticesZ[var9] - var15 * this.verticesX[var9] >> 16; - this.verticesX[var9] = var17; + if (var14 != 0) { + var16 = Model_sine[var14]; + var17 = Model_cosine[var14]; + var18 = var16 * this.verticesZ[var9] + var17 * this.verticesX[var9] >> 16; + this.verticesZ[var9] = var17 * this.verticesZ[var9] - var16 * this.verticesX[var9] >> 16; + this.verticesX[var9] = var18; } - var10000 = this.verticesX; - var10000[var9] += Model_transformTempX; - var10000 = this.verticesY; - var10000[var9] += Model_transformTempY; - var10000 = this.verticesZ; - var10000[var9] += Model_transformTempZ; + var19 = this.verticesX; + var19[var9] += Model_transformTempX; + var19 = this.verticesY; + var19[var9] += Model_transformTempY; + var19 = this.verticesZ; + var19[var9] += Model_transformTempZ; } } } - } else if (var1 == 3) { + } else if (type == 3) { for (var7 = 0; var7 < var6; ++var7) { - var8 = var2[var7]; + var8 = labels[var7]; if (var8 < this.vertexLabels.length) { - var18 = this.vertexLabels[var8]; + var12 = this.vertexLabels[var8]; - for (var19 = 0; var19 < var18.length; ++var19) { - var9 = var18[var19]; - var10000 = this.verticesX; - var10000[var9] -= Model_transformTempX; - var10000 = this.verticesY; - var10000[var9] -= Model_transformTempY; - var10000 = this.verticesZ; - var10000[var9] -= Model_transformTempZ; + for (var13 = 0; var13 < var12.length; ++var13) { + var9 = var12[var13]; + var19 = this.verticesX; + var19[var9] -= Model_transformTempX; + var19 = this.verticesY; + var19[var9] -= Model_transformTempY; + var19 = this.verticesZ; + var19[var9] -= Model_transformTempZ; this.verticesX[var9] = var3 * this.verticesX[var9] / 128; this.verticesY[var9] = var4 * this.verticesY[var9] / 128; this.verticesZ[var9] = var5 * this.verticesZ[var9] / 128; - var10000 = this.verticesX; - var10000[var9] += Model_transformTempX; - var10000 = this.verticesY; - var10000[var9] += Model_transformTempY; - var10000 = this.verticesZ; - var10000[var9] += Model_transformTempZ; + var19 = this.verticesX; + var19[var9] += Model_transformTempX; + var19 = this.verticesY; + var19[var9] += Model_transformTempY; + var19 = this.verticesZ; + var19[var9] += Model_transformTempZ; } } } - } else if (var1 == 5 && this.faceLabelsAlpha != null && this.faceAlphas != null) { + } else if (type == 5 && this.faceLabelsAlpha != null && this.faceAlphas != null) { for (var7 = 0; var7 < var6; ++var7) { - var8 = var2[var7]; + var8 = labels[var7]; if (var8 < this.faceLabelsAlpha.length) { - var18 = this.faceLabelsAlpha[var8]; + var12 = this.faceLabelsAlpha[var8]; - for (var19 = 0; var19 < var18.length; ++var19) { - var9 = var18[var19]; + for (var13 = 0; var13 < var12.length; ++var13) { + var9 = var12[var13]; var10 = (this.faceAlphas[var9] & 255) + var3 * 8; if (var10 < 0) { var10 = 0; @@ -923,9 +923,9 @@ public class Model extends Entity { @ObfuscatedName("y") @Export("rotateZ") - public void rotateZ(int var1) { - int var2 = Model_sine[var1]; - int var3 = Model_cosine[var1]; + public void rotateZ(int pitch) { + int var2 = Model_sine[pitch]; + int var3 = Model_cosine[pitch]; for (int var4 = 0; var4 < this.verticesCount; ++var4) { int var5 = var3 * this.verticesY[var4] - var2 * this.verticesZ[var4] >> 16; @@ -938,14 +938,14 @@ public class Model extends Entity { @ObfuscatedName("h") @Export("offsetBy") - public void offsetBy(int var1, int var2, int var3) { + public void offsetBy(int x, int y, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { - int[] var10000 = this.verticesX; - var10000[var4] += var1; - var10000 = this.verticesY; - var10000[var4] += var2; - var10000 = this.verticesZ; - var10000[var4] += var3; + int[] var5 = this.verticesX; + var5[var4] += x; + var5 = this.verticesY; + var5[var4] += y; + var5 = this.verticesZ; + var5[var4] += var3; } this.resetBounds(); @@ -953,10 +953,10 @@ public class Model extends Entity { @ObfuscatedName("b") @Export("scale") - public void scale(int var1, int var2, int var3) { + public void scale(int x, int y, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { - this.verticesX[var4] = this.verticesX[var4] * var1 / 128; - this.verticesY[var4] = var2 * this.verticesY[var4] / 128; + this.verticesX[var4] = this.verticesX[var4] * x / 128; + this.verticesY[var4] = y * this.verticesY[var4] / 128; this.verticesZ[var4] = var3 * this.verticesZ[var4] / 128; } @@ -1184,6 +1184,7 @@ public class Model extends Entity { field535[var7] = 0; } + int[] var30; for (var7 = this.diameter - 1; var7 >= 0; --var7) { var8 = field529[var7]; if (var8 > 0) { @@ -1195,8 +1196,8 @@ public class Model extends Entity { var12 = field531[var28]++; field532[var28][var12] = var10; if (var28 < 10) { - int[] var10000 = field535; - var10000[var28] += var7; + var30 = field535; + var30[var28] += var7; } else if (var28 == 10) { field533[var12] = var7; } else { @@ -1224,7 +1225,7 @@ public class Model extends Entity { var10 = 0; var11 = field531[10]; int[] var29 = field532[10]; - int[] var30 = field533; + var30 = field533; if (var10 == var11) { var10 = 0; var11 = field531[11]; @@ -1527,32 +1528,32 @@ public class Model extends Entity { } @ObfuscatedName("cy") - @Export("renderDraw") - void renderDraw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { + @Export("draw") + void draw(int yaw, int cameraPitchSine, int cameraPitchCosine, int cameraYawSine, int cameraYawCosine, int x, int y, int var8, long tag) { field529[0] = -1; if (this.boundsType != 1) { this.calculateBoundsCylinder(); } - this.calculateBoundingBox(var1); - int var11 = var5 * var8 - var4 * var6 >> 16; - int var12 = var2 * var7 + var3 * var11 >> 16; - int var13 = var3 * this.xzRadius >> 16; + this.calculateBoundingBox(yaw); + int var11 = cameraYawCosine * var8 - cameraYawSine * x >> 16; + int var12 = cameraPitchSine * y + cameraPitchCosine * var11 >> 16; + int var13 = cameraPitchCosine * this.xzRadius >> 16; int var14 = var12 + var13; if (var14 > 50 && var12 < 3500) { - int var15 = var8 * var4 + var5 * var6 >> 16; + int var15 = var8 * cameraYawSine + cameraYawCosine * x >> 16; int var16 = (var15 - this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; if (var16 / var14 < Rasterizer3D.Rasterizer3D_clipMidX2) { int var17 = (var15 + this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; if (var17 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidX) { - int var18 = var3 * var7 - var11 * var2 >> 16; - int var19 = var2 * this.xzRadius >> 16; + int var18 = cameraPitchCosine * y - var11 * cameraPitchSine >> 16; + int var19 = cameraPitchSine * this.xzRadius >> 16; int var20 = (var18 + var19) * Rasterizer3D.Rasterizer3D_zoom; if (var20 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidY) { - int var21 = (var3 * super.height >> 16) + var19; + int var21 = (cameraPitchCosine * super.height >> 16) + var19; int var22 = (var18 - var21) * Rasterizer3D.Rasterizer3D_zoom; if (var22 / var14 < Rasterizer3D.Rasterizer3D_clipMidY2) { - int var23 = var13 + (var2 * super.height >> 16); + int var23 = var13 + (cameraPitchSine * super.height >> 16); boolean var24 = false; boolean var25 = false; if (var12 - var23 <= 50) { @@ -1563,10 +1564,10 @@ public class Model extends Entity { int var27 = ViewportMouse.ViewportMouse_x; int var28 = ViewportMouse.ViewportMouse_y; boolean var29 = ViewportMouse.ViewportMouse_isInViewport; - boolean var30 = 0L != var9; + boolean var30 = 0L != tag; boolean var31; if (var30) { - var31 = (int)(var9 >>> 16 & 1L) == 1; + var31 = (int)(tag >>> 16 & 1L) == 1; var30 = !var31; } @@ -1577,7 +1578,7 @@ public class Model extends Entity { if (var30 && var29) { boolean var35 = false; if (field539) { - var35 = Decimator.method2491(this, var6, var7, var8); + var35 = Decimator.method2491(this, x, y, var8); } else { var32 = var12 - var13; if (var32 <= 50) { @@ -1609,7 +1610,7 @@ public class Model extends Entity { if (var35) { if (this.isSingleTile) { - Projectile.addEntityTagAtMouse(var9); + Projectile.addEntityTagAtMouse(tag); } else { var31 = true; } @@ -1620,9 +1621,9 @@ public class Model extends Entity { var32 = Rasterizer3D.Rasterizer3D_clipMidY; var33 = 0; var34 = 0; - if (var1 != 0) { - var33 = Model_sine[var1]; - var34 = Model_cosine[var1]; + if (yaw != 0) { + var33 = Model_sine[yaw]; + var34 = Model_cosine[yaw]; } for (int var36 = 0; var36 < this.verticesCount; ++var36) { @@ -1630,20 +1631,20 @@ public class Model extends Entity { int var38 = this.verticesY[var36]; int var39 = this.verticesZ[var36]; int var40; - if (var1 != 0) { + if (yaw != 0) { var40 = var39 * var33 + var37 * var34 >> 16; var39 = var39 * var34 - var37 * var33 >> 16; var37 = var40; } - var37 += var6; - var38 += var7; + var37 += x; + var38 += y; var39 += var8; - var40 = var39 * var4 + var5 * var37 >> 16; - var39 = var5 * var39 - var37 * var4 >> 16; + var40 = var39 * cameraYawSine + cameraYawCosine * var37 >> 16; + var39 = cameraYawCosine * var39 - var37 * cameraYawSine >> 16; var37 = var40; - var40 = var3 * var38 - var39 * var2 >> 16; - var39 = var38 * var2 + var3 * var39 >> 16; + var40 = cameraPitchCosine * var38 - var39 * cameraPitchSine >> 16; + var39 = var38 * cameraPitchSine + cameraPitchCosine * var39 >> 16; field525[var36] = var39 - var12; if (var39 >= 50) { modelViewportXs[var36] = var37 * Rasterizer3D.Rasterizer3D_zoom / var39 + var42; @@ -1661,7 +1662,7 @@ public class Model extends Entity { } try { - this.draw0(var24, var31, this.isSingleTile, var9); + this.draw0(var24, var31, this.isSingleTile, tag); } catch (Exception var41) { } } diff --git a/runescape-client/src/main/java/ModelData.java b/runescape-client/src/main/java/ModelData.java index 9ae3c76bc6..f466b29af9 100644 --- a/runescape-client/src/main/java/ModelData.java +++ b/runescape-client/src/main/java/ModelData.java @@ -1119,30 +1119,30 @@ public class ModelData extends Entity { void method208() { int[] var1; int var2; - int var10002; - int var3; + int var10003; int var4; + int var5; if (this.field555 != null) { var1 = new int[256]; var2 = 0; - for (var3 = 0; var3 < this.verticesCount; ++var3) { - var4 = this.field555[var3]; - var10002 = var1[var4]++; - if (var4 > var2) { - var2 = var4; + for (var4 = 0; var4 < this.verticesCount; ++var4) { + var5 = this.field555[var4]; + var10003 = var1[var5]++; + if (var5 > var2) { + var2 = var5; } } this.vertexLabels = new int[var2 + 1][]; - for (var3 = 0; var3 <= var2; ++var3) { - this.vertexLabels[var3] = new int[var1[var3]]; - var1[var3] = 0; + for (var4 = 0; var4 <= var2; ++var4) { + this.vertexLabels[var4] = new int[var1[var4]]; + var1[var4] = 0; } - for (var3 = 0; var3 < this.verticesCount; this.vertexLabels[var4][var1[var4]++] = var3++) { - var4 = this.field555[var3]; + for (var4 = 0; var4 < this.verticesCount; this.vertexLabels[var5][var1[var5]++] = var4++) { + var5 = this.field555[var4]; } this.field555 = null; @@ -1152,23 +1152,23 @@ public class ModelData extends Entity { var1 = new int[256]; var2 = 0; - for (var3 = 0; var3 < this.faceCount; ++var3) { - var4 = this.field556[var3]; - var10002 = var1[var4]++; - if (var4 > var2) { - var2 = var4; + for (var4 = 0; var4 < this.faceCount; ++var4) { + var5 = this.field556[var4]; + var10003 = var1[var5]++; + if (var5 > var2) { + var2 = var5; } } this.faceLabelsAlpha = new int[var2 + 1][]; - for (var3 = 0; var3 <= var2; ++var3) { - this.faceLabelsAlpha[var3] = new int[var1[var3]]; - var1[var3] = 0; + for (var4 = 0; var4 <= var2; ++var4) { + this.faceLabelsAlpha[var4] = new int[var1[var4]]; + var1[var4] = 0; } - for (var3 = 0; var3 < this.faceCount; this.faceLabelsAlpha[var4][var1[var4]++] = var3++) { - var4 = this.field556[var3]; + for (var4 = 0; var4 < this.faceCount; this.faceLabelsAlpha[var5][var1[var5]++] = var4++) { + var5 = this.field556[var4]; } this.field556 = null; @@ -1225,12 +1225,12 @@ public class ModelData extends Entity { @ObfuscatedName("z") public void method213(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { - int[] var10000 = this.verticesX; - var10000[var4] += var1; - var10000 = this.verticesY; - var10000[var4] += var2; - var10000 = this.verticesZ; - var10000[var4] += var3; + int[] var5 = this.verticesX; + var5[var4] += var1; + var5 = this.verticesY; + var5[var4] += var2; + var5 = this.verticesZ; + var5[var4] += var3; } this.invalidate(); @@ -1238,9 +1238,9 @@ public class ModelData extends Entity { @ObfuscatedName("j") @Export("recolor") - public void recolor(short var1, short var2) { + public void recolor(short from, short var2) { for (int var3 = 0; var3 < this.faceCount; ++var3) { - if (this.faceColors[var3] == var1) { + if (this.faceColors[var3] == from) { this.faceColors[var3] = var2; } } @@ -1249,10 +1249,10 @@ public class ModelData extends Entity { @ObfuscatedName("s") @Export("retexture") - public void retexture(short var1, short var2) { + public void retexture(short from, short var2) { if (this.faceTextures != null) { for (int var3 = 0; var3 < this.faceCount; ++var3) { - if (this.faceTextures[var3] == var1) { + if (this.faceTextures[var3] == from) { this.faceTextures[var3] = var2; } } @@ -1606,8 +1606,8 @@ public class ModelData extends Entity { @ObfuscatedSignature( signature = "(Lir;II)Ldw;" ) - public static ModelData method2788(AbstractIndexCache var0, int var1, int var2) { - byte[] var3 = var0.takeRecord(var1, var2); + public static ModelData method2788(AbstractArchive var0, int var1, int var2) { + byte[] var3 = var0.takeFile(var1, var2); return var3 == null ? null : new ModelData(var3); } diff --git a/runescape-client/src/main/java/MouseHandler.java b/runescape-client/src/main/java/MouseHandler.java index d7f7c7f983..f3e1510f7e 100644 --- a/runescape-client/src/main/java/MouseHandler.java +++ b/runescape-client/src/main/java/MouseHandler.java @@ -136,9 +136,9 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi garbageValue = "-965288682" ) @Export("getButton") - final int getButton(MouseEvent var1) { - int var2 = var1.getButton(); - return !var1.isAltDown() && var2 != 2 ? (!var1.isMetaDown() && var2 != 3 ? 1 : 2) : 4; + final int getButton(MouseEvent mouseEvent) { + int var2 = mouseEvent.getButton(); + return !mouseEvent.isAltDown() && var2 != 2 ? (!mouseEvent.isMetaDown() && var2 != 3 ? 1 : 2) : 4; } @Export("mouseMoved") diff --git a/runescape-client/src/main/java/MouseRecorder.java b/runescape-client/src/main/java/MouseRecorder.java index 01c8725cbb..99f0dff651 100644 --- a/runescape-client/src/main/java/MouseRecorder.java +++ b/runescape-client/src/main/java/MouseRecorder.java @@ -49,8 +49,6 @@ public class MouseRecorder implements Runnable { this.millis = new long[500]; } - @Export("run") - @ObfuscatedName("run") public void run() { for (; this.isRunning; class203.method4010(50L)) { Object var1 = this.lock; @@ -73,39 +71,39 @@ public class MouseRecorder implements Runnable { ) @Export("drawObject") static final void drawObject(int var0, int var1, int var2, int var3, int var4) { - long var5 = class65.scene.method290(var0, var1, var2); + long var5 = class65.scene.getBoundaryObjectTag(var0, var1, var2); int var7; int var8; int var9; int var10; int var11; int var12; - int var17; + int var13; if (var5 != 0L) { var7 = class65.scene.getObjectFlags(var0, var1, var2, var5); var8 = var7 >> 6 & 3; var9 = var7 & 31; var10 = var3; - boolean var13 = var5 != 0L; - if (var13) { - boolean var14 = (int)(var5 >>> 16 & 1L) == 1; - var13 = !var14; + boolean var14 = var5 != 0L; + if (var14) { + boolean var15 = (int)(var5 >>> 16 & 1L) == 1; + var14 = !var15; } - if (var13) { + if (var14) { var10 = var4; } - int[] var20 = WidgetGroupParent.sceneMinimapSprite.pixels; + int[] var20 = InterfaceParent.sceneMinimapSprite.pixels; var12 = var1 * 4 + (103 - var2) * 2048 + 24624; var11 = HitSplatDefinition.method4972(var5); - ObjectDefinition var15 = class50.getObjectDefinition(var11); - if (var15.mapSceneId != -1) { - IndexedSprite var16 = class192.mapSceneSprites[var15.mapSceneId]; - if (var16 != null) { - var17 = (var15.sizeX * 4 - var16.subWidth) / 2; - int var18 = (var15.sizeY * 4 - var16.subHeight) / 2; - var16.drawAt(var1 * 4 + var17 + 48, (104 - var2 - var15.sizeY) * 4 + var18 + 48); + ObjectDefinition var16 = class50.getObjectDefinition(var11); + if (var16.mapSceneId != -1) { + IndexedSprite var17 = class192.mapSceneSprites[var16.mapSceneId]; + if (var17 != null) { + var13 = (var16.sizeX * 4 - var17.subWidth) / 2; + int var18 = (var16.sizeY * 4 - var17.subHeight) / 2; + var17.drawAt(var1 * 4 + var13 + 48, (104 - var2 - var16.sizeY) * 4 + var18 + 48); } } else { if (var9 == 0 || var9 == 2) { @@ -170,9 +168,10 @@ public class MouseRecorder implements Runnable { } } - var5 = class65.scene.method292(var0, var1, var2); + var5 = class65.scene.getGameObjectTag(var0, var1, var2); ObjectDefinition var19; IndexedSprite var21; + int var22; if (0L != var5) { var7 = class65.scene.getObjectFlags(var0, var1, var2, var5); var8 = var7 >> 6 & 3; @@ -187,7 +186,7 @@ public class MouseRecorder implements Runnable { var21.drawAt(var12 + var1 * 4 + 48, (104 - var2 - var19.sizeY) * 4 + var11 + 48); } } else if (var9 == 9) { - int var22 = 15658734; + var22 = 15658734; boolean var23 = 0L != var5; if (var23) { boolean var24 = (int)(var5 >>> 16 & 1L) == 1; @@ -198,18 +197,18 @@ public class MouseRecorder implements Runnable { var22 = 15597568; } - int[] var26 = WidgetGroupParent.sceneMinimapSprite.pixels; - var17 = var1 * 4 + (103 - var2) * 2048 + 24624; + int[] var25 = InterfaceParent.sceneMinimapSprite.pixels; + var13 = var1 * 4 + (103 - var2) * 2048 + 24624; if (var8 != 0 && var8 != 2) { - var26[var17] = var22; - var26[var17 + 1 + 512] = var22; - var26[var17 + 1024 + 2] = var22; - var26[var17 + 1536 + 3] = var22; + var25[var13] = var22; + var25[var13 + 1 + 512] = var22; + var25[var13 + 1024 + 2] = var22; + var25[var13 + 1536 + 3] = var22; } else { - var26[var17 + 1536] = var22; - var26[var17 + 1 + 1024] = var22; - var26[var17 + 512 + 2] = var22; - var26[var17 + 3] = var22; + var25[var13 + 1536] = var22; + var25[var13 + 1 + 1024] = var22; + var25[var13 + 512 + 2] = var22; + var25[var13 + 3] = var22; } } } @@ -222,8 +221,8 @@ public class MouseRecorder implements Runnable { var21 = class192.mapSceneSprites[var19.mapSceneId]; if (var21 != null) { var10 = (var19.sizeX * 4 - var21.subWidth) / 2; - int var25 = (var19.sizeY * 4 - var21.subHeight) / 2; - var21.drawAt(var10 + var1 * 4 + 48, var25 + (104 - var2 - var19.sizeY) * 4 + 48); + var22 = (var19.sizeY * 4 - var21.subHeight) / 2; + var21.drawAt(var10 + var1 * 4 + 48, var22 + (104 - var2 - var19.sizeY) * 4 + 48); } } } @@ -272,10 +271,10 @@ public class MouseRecorder implements Runnable { if (var4 != null) { Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); if (Client.minimapState != 2 && Client.minimapState != 5) { - int var5 = Client.minimapOrientation & 2047; + int var5 = Client.camAngleY & 2047; int var6 = Canvas.localPlayer.x / 32 + 48; int var7 = 464 - Canvas.localPlayer.y / 32; - WidgetGroupParent.sceneMinimapSprite.method315(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); + InterfaceParent.sceneMinimapSprite.method315(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); int var8; int var9; diff --git a/runescape-client/src/main/java/MouseWheelHandler.java b/runescape-client/src/main/java/MouseWheelHandler.java index 62907185a1..008e033335 100644 --- a/runescape-client/src/main/java/MouseWheelHandler.java +++ b/runescape-client/src/main/java/MouseWheelHandler.java @@ -27,8 +27,8 @@ public final class MouseWheelHandler implements MouseWheel, MouseWheelListener { garbageValue = "-28" ) @Export("addTo") - void addTo(Component var1) { - var1.addMouseWheelListener(this); + void addTo(Component component) { + component.addMouseWheelListener(this); } @ObfuscatedName("f") @@ -37,8 +37,8 @@ public final class MouseWheelHandler implements MouseWheel, MouseWheelListener { garbageValue = "-544062729" ) @Export("removeFrom") - void removeFrom(Component var1) { - var1.removeMouseWheelListener(this); + void removeFrom(Component component) { + component.removeMouseWheelListener(this); } @ObfuscatedName("q") diff --git a/runescape-client/src/main/java/MusicPatchPcmStream.java b/runescape-client/src/main/java/MusicPatchPcmStream.java index 2109c5b68a..f8cd4f1e2c 100644 --- a/runescape-client/src/main/java/MusicPatchPcmStream.java +++ b/runescape-client/src/main/java/MusicPatchPcmStream.java @@ -56,7 +56,7 @@ public class MusicPatchPcmStream extends PcmStream { break; } - var1.stream.vmethod263(var2, var3, var7); + var1.stream.fill(var2, var3, var7); var3 += var7; var4 -= var7; var1.field591 += var7 * var6 - 1048576; @@ -80,14 +80,14 @@ public class MusicPatchPcmStream extends PcmStream { } var10.method275(var8); - var10.vmethod263(var2, var3, var5 - var3); + var10.fill(var2, var3, var5 - var3); if (var10.method279()) { this.mixer.addSubStream(var10); } } } - var1.stream.vmethod263(var2, var3, var4); + var1.stream.fill(var2, var3, var4); } @ObfuscatedName("f") @@ -116,7 +116,7 @@ public class MusicPatchPcmStream extends PcmStream { } } - var1.stream.vmethod264(var2); + var1.stream.skip(var2); } @ObfuscatedName("u") @@ -152,8 +152,9 @@ public class MusicPatchPcmStream extends PcmStream { } @ObfuscatedName("e") - protected void vmethod263(int[] var1, int var2, int var3) { - this.mixer.vmethod263(var1, var2, var3); + @Export("fill") + protected void fill(int[] var1, int var2, int var3) { + this.mixer.fill(var1, var2, var3); for (MusicPatchNode var4 = (MusicPatchNode)this.queue.last(); var4 != null; var4 = (MusicPatchNode)this.queue.previous()) { if (!this.superStream.method195(var4)) { @@ -177,8 +178,9 @@ public class MusicPatchPcmStream extends PcmStream { } @ObfuscatedName("d") - protected void vmethod264(int var1) { - this.mixer.vmethod264(var1); + @Export("skip") + protected void skip(int var1) { + this.mixer.skip(var1); for (MusicPatchNode var2 = (MusicPatchNode)this.queue.last(); var2 != null; var2 = (MusicPatchNode)this.queue.previous()) { if (!this.superStream.method195(var2)) { diff --git a/runescape-client/src/main/java/MusicSample.java b/runescape-client/src/main/java/MusicSample.java index 99bd23e94c..48d701efb9 100644 --- a/runescape-client/src/main/java/MusicSample.java +++ b/runescape-client/src/main/java/MusicSample.java @@ -175,9 +175,10 @@ public class MusicSample extends Node { boolean var17 = !field1324[var16].method2367(); boolean var18 = var17; + float[] var20; for (var16 = 0; var16 < var14.field1453; ++var16) { class109 var19 = field1344[var14.field1455[var16]]; - float[] var20 = field611; + var20 = field611; var19.method2473(var20, var4 >> 1, var18); } @@ -188,9 +189,9 @@ public class MusicSample extends Node { field1324[var48].method2375(field611, var4 >> 1); } - float[] var21; + int var21; int var22; - int var49; + float[] var23; if (var17) { for (var16 = var4 >> 1; var16 < var4; ++var16) { field611[var16] = 0.0F; @@ -198,18 +199,18 @@ public class MusicSample extends Node { } else { var16 = var4 >> 1; var48 = var4 >> 2; - var49 = var4 >> 3; - var21 = field611; + var22 = var4 >> 3; + var20 = field611; - for (var22 = 0; var22 < var16; ++var22) { - var21[var22] *= 0.5F; + for (var21 = 0; var21 < var16; ++var21) { + var20[var21] *= 0.5F; } - for (var22 = var16; var22 < var4; ++var22) { - var21[var22] = -var21[var4 - var22 - 1]; + for (var21 = var16; var21 < var4; ++var21) { + var20[var21] = -var20[var4 - var21 - 1]; } - float[] var23 = var3 ? field615 : field612; + var23 = var3 ? field615 : field612; float[] var24 = var3 ? field616 : field613; float[] var25 = var3 ? field617 : field614; int[] var26 = var3 ? field619 : field618; @@ -220,27 +221,27 @@ public class MusicSample extends Node { float var30; float var31; for (var27 = 0; var27 < var48; ++var27) { - var28 = var21[var27 * 4] - var21[var4 - var27 * 4 - 1]; - var29 = var21[var27 * 4 + 2] - var21[var4 - var27 * 4 - 3]; + var28 = var20[var27 * 4] - var20[var4 - var27 * 4 - 1]; + var29 = var20[var27 * 4 + 2] - var20[var4 - var27 * 4 - 3]; var30 = var23[var27 * 2]; var31 = var23[var27 * 2 + 1]; - var21[var4 - var27 * 4 - 1] = var28 * var30 - var29 * var31; - var21[var4 - var27 * 4 - 3] = var28 * var31 + var29 * var30; + var20[var4 - var27 * 4 - 1] = var28 * var30 - var29 * var31; + var20[var4 - var27 * 4 - 3] = var28 * var31 + var29 * var30; } float var32; float var33; - for (var27 = 0; var27 < var49; ++var27) { - var28 = var21[var16 + var27 * 4 + 3]; - var29 = var21[var16 + var27 * 4 + 1]; - var30 = var21[var27 * 4 + 3]; - var31 = var21[var27 * 4 + 1]; - var21[var16 + var27 * 4 + 3] = var28 + var30; - var21[var16 + var27 * 4 + 1] = var29 + var31; + for (var27 = 0; var27 < var22; ++var27) { + var28 = var20[var16 + var27 * 4 + 3]; + var29 = var20[var16 + var27 * 4 + 1]; + var30 = var20[var27 * 4 + 3]; + var31 = var20[var27 * 4 + 1]; + var20[var16 + var27 * 4 + 3] = var28 + var30; + var20[var16 + var27 * 4 + 1] = var29 + var31; var32 = var23[var16 - 4 - var27 * 4]; var33 = var23[var16 - 3 - var27 * 4]; - var21[var27 * 4 + 3] = (var28 - var30) * var32 - (var29 - var31) * var33; - var21[var27 * 4 + 1] = (var29 - var31) * var32 + (var28 - var30) * var33; + var20[var27 * 4 + 3] = (var28 - var30) * var32 - (var29 - var31) * var33; + var20[var27 * 4 + 1] = (var29 - var31) * var32 + (var28 - var30) * var33; } var27 = WorldMapCacheName.method634(var4 - 1); @@ -259,127 +260,127 @@ public class MusicSample extends Node { for (int var40 = 0; var40 < var4 >> var34 + 4; ++var40) { int var41 = var40 * 4; - float var42 = var21[var38 - 1 - var41]; - float var43 = var21[var38 - 3 - var41]; - float var44 = var21[var39 - 1 - var41]; - float var45 = var21[var39 - 3 - var41]; - var21[var38 - 1 - var41] = var42 + var44; - var21[var38 - 3 - var41] = var43 + var45; + float var42 = var20[var38 - 1 - var41]; + float var43 = var20[var38 - 3 - var41]; + float var44 = var20[var39 - 1 - var41]; + float var45 = var20[var39 - 3 - var41]; + var20[var38 - 1 - var41] = var42 + var44; + var20[var38 - 3 - var41] = var43 + var45; float var46 = var23[var40 * var36]; float var47 = var23[var40 * var36 + 1]; - var21[var39 - 1 - var41] = (var42 - var44) * var46 - (var43 - var45) * var47; - var21[var39 - 3 - var41] = (var43 - var45) * var46 + (var42 - var44) * var47; + var20[var39 - 1 - var41] = (var42 - var44) * var46 - (var43 - var45) * var47; + var20[var39 - 3 - var41] = (var43 - var45) * var46 + (var42 - var44) * var47; } } } - for (var34 = 1; var34 < var49 - 1; ++var34) { + for (var34 = 1; var34 < var22 - 1; ++var34) { var35 = var26[var34]; if (var34 < var35) { var36 = var34 * 8; var37 = var35 * 8; - var32 = var21[var36 + 1]; - var21[var36 + 1] = var21[var37 + 1]; - var21[var37 + 1] = var32; - var32 = var21[var36 + 3]; - var21[var36 + 3] = var21[var37 + 3]; - var21[var37 + 3] = var32; - var32 = var21[var36 + 5]; - var21[var36 + 5] = var21[var37 + 5]; - var21[var37 + 5] = var32; - var32 = var21[var36 + 7]; - var21[var36 + 7] = var21[var37 + 7]; - var21[var37 + 7] = var32; + var32 = var20[var36 + 1]; + var20[var36 + 1] = var20[var37 + 1]; + var20[var37 + 1] = var32; + var32 = var20[var36 + 3]; + var20[var36 + 3] = var20[var37 + 3]; + var20[var37 + 3] = var32; + var32 = var20[var36 + 5]; + var20[var36 + 5] = var20[var37 + 5]; + var20[var37 + 5] = var32; + var32 = var20[var36 + 7]; + var20[var36 + 7] = var20[var37 + 7]; + var20[var37 + 7] = var32; } } for (var34 = 0; var34 < var16; ++var34) { - var21[var34] = var21[var34 * 2 + 1]; + var20[var34] = var20[var34 * 2 + 1]; } - for (var34 = 0; var34 < var49; ++var34) { - var21[var4 - 1 - var34 * 2] = var21[var34 * 4]; - var21[var4 - 2 - var34 * 2] = var21[var34 * 4 + 1]; - var21[var4 - var48 - 1 - var34 * 2] = var21[var34 * 4 + 2]; - var21[var4 - var48 - 2 - var34 * 2] = var21[var34 * 4 + 3]; + for (var34 = 0; var34 < var22; ++var34) { + var20[var4 - 1 - var34 * 2] = var20[var34 * 4]; + var20[var4 - 2 - var34 * 2] = var20[var34 * 4 + 1]; + var20[var4 - var48 - 1 - var34 * 2] = var20[var34 * 4 + 2]; + var20[var4 - var48 - 2 - var34 * 2] = var20[var34 * 4 + 3]; } - for (var34 = 0; var34 < var49; ++var34) { + for (var34 = 0; var34 < var22; ++var34) { var29 = var25[var34 * 2]; var30 = var25[var34 * 2 + 1]; - var31 = var21[var16 + var34 * 2]; - var32 = var21[var16 + var34 * 2 + 1]; - var33 = var21[var4 - 2 - var34 * 2]; - float var51 = var21[var4 - 1 - var34 * 2]; - float var52 = var30 * (var31 - var33) + var29 * (var32 + var51); - var21[var16 + var34 * 2] = (var31 + var33 + var52) * 0.5F; - var21[var4 - 2 - var34 * 2] = (var31 + var33 - var52) * 0.5F; - var52 = var30 * (var32 + var51) - var29 * (var31 - var33); - var21[var16 + var34 * 2 + 1] = (var32 - var51 + var52) * 0.5F; - var21[var4 - 1 - var34 * 2] = (-var32 + var51 + var52) * 0.5F; + var31 = var20[var16 + var34 * 2]; + var32 = var20[var16 + var34 * 2 + 1]; + var33 = var20[var4 - 2 - var34 * 2]; + float var49 = var20[var4 - 1 - var34 * 2]; + float var51 = var30 * (var31 - var33) + var29 * (var32 + var49); + var20[var16 + var34 * 2] = (var31 + var33 + var51) * 0.5F; + var20[var4 - 2 - var34 * 2] = (var31 + var33 - var51) * 0.5F; + var51 = var30 * (var32 + var49) - var29 * (var31 - var33); + var20[var16 + var34 * 2 + 1] = (var32 - var49 + var51) * 0.5F; + var20[var4 - 1 - var34 * 2] = (-var32 + var49 + var51) * 0.5F; } for (var34 = 0; var34 < var48; ++var34) { - var21[var34] = var21[var16 + var34 * 2] * var24[var34 * 2] + var21[var16 + var34 * 2 + 1] * var24[var34 * 2 + 1]; - var21[var16 - 1 - var34] = var21[var16 + var34 * 2] * var24[var34 * 2 + 1] - var21[var16 + var34 * 2 + 1] * var24[var34 * 2]; + var20[var34] = var20[var16 + var34 * 2] * var24[var34 * 2] + var20[var16 + var34 * 2 + 1] * var24[var34 * 2 + 1]; + var20[var16 - 1 - var34] = var20[var16 + var34 * 2] * var24[var34 * 2 + 1] - var20[var16 + var34 * 2 + 1] * var24[var34 * 2]; } for (var34 = 0; var34 < var48; ++var34) { - var21[var34 + (var4 - var48)] = -var21[var34]; + var20[var34 + (var4 - var48)] = -var20[var34]; } for (var34 = 0; var34 < var48; ++var34) { - var21[var34] = var21[var48 + var34]; + var20[var34] = var20[var48 + var34]; } for (var34 = 0; var34 < var48; ++var34) { - var21[var48 + var34] = -var21[var48 - var34 - 1]; + var20[var48 + var34] = -var20[var48 - var34 - 1]; } for (var34 = 0; var34 < var48; ++var34) { - var21[var16 + var34] = var21[var4 - var34 - 1]; + var20[var16 + var34] = var20[var4 - var34 - 1]; } - float[] var10000; + float[] var50; for (var34 = var8; var34 < var9; ++var34) { var29 = (float)Math.sin(((double)(var34 - var8) + 0.5D) / (double)var10 * 0.5D * 3.141592653589793D); - var10000 = field611; - var10000[var34] *= (float)Math.sin(1.5707963267948966D * (double)var29 * (double)var29); + var50 = field611; + var50[var34] *= (float)Math.sin(1.5707963267948966D * (double)var29 * (double)var29); } for (var34 = var11; var34 < var12; ++var34) { var29 = (float)Math.sin(((double)(var34 - var11) + 0.5D) / (double)var13 * 0.5D * 3.141592653589793D + 1.5707963267948966D); - var10000 = field611; - var10000[var34] *= (float)Math.sin(1.5707963267948966D * (double)var29 * (double)var29); + var50 = field611; + var50[var34] *= (float)Math.sin(1.5707963267948966D * (double)var29 * (double)var29); } } - var21 = null; + var20 = null; if (this.field623 > 0) { var48 = var4 + this.field623 >> 2; - var21 = new float[var48]; + var20 = new float[var48]; if (!this.field625) { - for (var49 = 0; var49 < this.field624; ++var49) { - var22 = var49 + (this.field623 >> 1); - var21[var49] += this.field622[var22]; + for (var22 = 0; var22 < this.field624; ++var22) { + var21 = var22 + (this.field623 >> 1); + var20[var22] += this.field622[var21]; } } if (!var17) { - for (var49 = var8; var49 < var4 >> 1; ++var49) { - var22 = var21.length - (var4 >> 1) + var49; - var21[var22] += field611[var49]; + for (var22 = var8; var22 < var4 >> 1; ++var22) { + var21 = var20.length - (var4 >> 1) + var22; + var20[var21] += field611[var22]; } } } - float[] var50 = this.field622; + var23 = this.field622; this.field622 = field611; - field611 = var50; + field611 = var23; this.field623 = var4; this.field624 = var12 - (var4 >> 1); this.field625 = var17; - return var21; + return var20; } @ObfuscatedName("x") @@ -597,9 +598,9 @@ public class MusicSample extends Node { @ObfuscatedSignature( signature = "(Lir;)Z" ) - static boolean method2343(AbstractIndexCache var0) { + static boolean method2343(AbstractArchive var0) { if (!field610) { - byte[] var1 = var0.takeRecord(0, 0); + byte[] var1 = var0.takeFile(0, 0); if (var1 == null) { return false; } @@ -616,12 +617,12 @@ public class MusicSample extends Node { signature = "(Lir;II)Lcd;" ) @Export("readMusicSample") - static MusicSample readMusicSample(AbstractIndexCache var0, int var1, int var2) { + static MusicSample readMusicSample(AbstractArchive var0, int var1, int var2) { if (!method2343(var0)) { - var0.tryLoadRecord(var1, var2); + var0.tryLoadFile(var1, var2); return null; } else { - byte[] var3 = var0.takeRecord(var1, var2); + byte[] var3 = var0.takeFile(var1, var2); return var3 == null ? null : new MusicSample(var3); } } diff --git a/runescape-client/src/main/java/MusicTrack.java b/runescape-client/src/main/java/MusicTrack.java index 4147ba52f9..deb18fb6d6 100644 --- a/runescape-client/src/main/java/MusicTrack.java +++ b/runescape-client/src/main/java/MusicTrack.java @@ -427,8 +427,8 @@ public class MusicTrack extends Node { signature = "(Lir;II)Lhe;" ) @Export("readTrack") - public static MusicTrack readTrack(AbstractIndexCache var0, int var1, int var2) { - byte[] var3 = var0.takeRecord(var1, var2); + public static MusicTrack readTrack(AbstractArchive var0, int var1, int var2) { + byte[] var3 = var0.takeFile(var1, var2); return var3 == null ? null : new MusicTrack(new Buffer(var3)); } } diff --git a/runescape-client/src/main/java/NPC.java b/runescape-client/src/main/java/NPC.java index 81857313b4..29b6330f94 100644 --- a/runescape-client/src/main/java/NPC.java +++ b/runescape-client/src/main/java/NPC.java @@ -127,7 +127,7 @@ public final class NPC extends Actor { return null; } else { SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? WorldMapAreaData.getSequenceDefinition(super.sequence) : null; - SequenceDefinition var2 = super.movementSequence == -1 || super.movementSequence == super.idleSequence && var1 != null ? null : WorldMapAreaData.getSequenceDefinition(super.movementSequence); + SequenceDefinition var2 = super.movementSequence != -1 && (super.movementSequence != super.readySequence || var1 == null) ? WorldMapAreaData.getSequenceDefinition(super.movementSequence) : null; Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame); if (var3 == null) { return null; @@ -167,27 +167,27 @@ public final class NPC extends Actor { signature = "(ILff;Lit;B)V", garbageValue = "-51" ) - static void method2009(int var0, IndexStore var1, IndexCache var2) { - IndexStoreAction var3 = new IndexStoreAction(); + static void method2009(int var0, ArchiveDisk var1, Archive var2) { + ArchiveDiskAction var3 = new ArchiveDiskAction(); var3.type = 1; var3.key = (long)var0; - var3.indexStore = var1; - var3.indexCache = var2; - NodeDeque var4 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue; - synchronized(IndexStoreActionHandler.IndexStoreActionHandler_requestQueue) { - IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.addFirst(var3); + var3.archiveDisk = var1; + var3.archive = var2; + NodeDeque var4 = ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); } - Object var5 = IndexStoreActionHandler.IndexStoreActionHandler_lock; - synchronized(IndexStoreActionHandler.IndexStoreActionHandler_lock) { - if (IndexStoreActionHandler.field412 == 0) { - Frames.IndexStoreActionHandler_thread = new Thread(new IndexStoreActionHandler()); - Frames.IndexStoreActionHandler_thread.setDaemon(true); - Frames.IndexStoreActionHandler_thread.start(); - Frames.IndexStoreActionHandler_thread.setPriority(5); + Object var5 = ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { + if (ArchiveDiskActionHandler.field412 == 0) { + Frames.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); + Frames.ArchiveDiskActionHandler_thread.setDaemon(true); + Frames.ArchiveDiskActionHandler_thread.start(); + Frames.ArchiveDiskActionHandler_thread.setPriority(5); } - IndexStoreActionHandler.field412 = 600; + ArchiveDiskActionHandler.field412 = 600; } } } diff --git a/runescape-client/src/main/java/NPCDefinition.java b/runescape-client/src/main/java/NPCDefinition.java index 859d5d979e..4f473abdf5 100644 --- a/runescape-client/src/main/java/NPCDefinition.java +++ b/runescape-client/src/main/java/NPCDefinition.java @@ -16,14 +16,14 @@ public class NPCDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("NpcDefinition_indexCache") - static AbstractIndexCache NpcDefinition_indexCache; + @Export("NpcDefinition_archive") + static AbstractArchive NpcDefinition_archive; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lir;" ) - @Export("NpcDefinition_modelIndexCache") - static AbstractIndexCache NpcDefinition_modelIndexCache; + @Export("NpcDefinition_modelArchive") + static AbstractArchive NpcDefinition_modelArchive; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Ler;" @@ -52,16 +52,16 @@ public class NPCDefinition extends DualNode { @Export("size") public int size; @ObfuscatedName("l") - @Export("archives") - int[] archives; + @Export("models") + int[] models; @ObfuscatedName("e") int[] field636; @ObfuscatedName("x") @ObfuscatedGetter( intValue = 275200787 ) - @Export("idleSequence") - public int idleSequence; + @Export("readySequence") + public int readySequence; @ObfuscatedName("d") @ObfuscatedGetter( intValue = 819690597 @@ -84,20 +84,20 @@ public class NPCDefinition extends DualNode { @ObfuscatedGetter( intValue = 1952230339 ) - @Export("walkTurnSequence") - public int walkTurnSequence; + @Export("walkBackSequence") + public int walkBackSequence; @ObfuscatedName("a") @ObfuscatedGetter( intValue = -1213774321 ) - @Export("walkTurnLeftSequence") - public int walkTurnLeftSequence; + @Export("walkLeftSequence") + public int walkLeftSequence; @ObfuscatedName("z") @ObfuscatedGetter( intValue = -96930503 ) - @Export("walkTurnRightSequence") - public int walkTurnRightSequence; + @Export("walkRightSequence") + public int walkRightSequence; @ObfuscatedName("j") @Export("recolorFrom") short[] recolorFrom; @@ -192,13 +192,13 @@ public class NPCDefinition extends DualNode { NPCDefinition() { this.name = "null"; this.size = 1; - this.idleSequence = -1; + this.readySequence = -1; this.turnLeftSequence = -1; this.turnRightSequence = -1; this.walkSequence = -1; - this.walkTurnSequence = -1; - this.walkTurnLeftSequence = -1; - this.walkTurnRightSequence = -1; + this.walkBackSequence = -1; + this.walkLeftSequence = -1; + this.walkRightSequence = -1; this.actions = new String[5]; this.drawMapDot = true; this.combatLevel = -1; @@ -221,8 +221,8 @@ public class NPCDefinition extends DualNode { signature = "(I)V", garbageValue = "482179419" ) - @Export("init") - void init() { + @Export("postDecode") + void postDecode() { } @ObfuscatedName("w") @@ -230,15 +230,15 @@ public class NPCDefinition extends DualNode { signature = "(Lgr;I)V", garbageValue = "-893102766" ) - @Export("read") - void read(Buffer var1) { + @Export("decode") + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -247,23 +247,23 @@ public class NPCDefinition extends DualNode { signature = "(Lgr;IB)V", garbageValue = "-98" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { int var3; int var4; if (var2 == 1) { var3 = var1.readUnsignedByte(); - this.archives = new int[var3]; + this.models = new int[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.archives[var4] = var1.readUnsignedShort(); + this.models[var4] = var1.readUnsignedShort(); } } else if (var2 == 2) { this.name = var1.readStringCp1252NullTerminated(); } else if (var2 == 12) { this.size = var1.readUnsignedByte(); } else if (var2 == 13) { - this.idleSequence = var1.readUnsignedShort(); + this.readySequence = var1.readUnsignedShort(); } else if (var2 == 14) { this.walkSequence = var1.readUnsignedShort(); } else if (var2 == 15) { @@ -272,9 +272,9 @@ public class NPCDefinition extends DualNode { this.turnRightSequence = var1.readUnsignedShort(); } else if (var2 == 17) { this.walkSequence = var1.readUnsignedShort(); - this.walkTurnSequence = var1.readUnsignedShort(); - this.walkTurnLeftSequence = var1.readUnsignedShort(); - this.walkTurnRightSequence = var1.readUnsignedShort(); + this.walkBackSequence = var1.readUnsignedShort(); + this.walkLeftSequence = var1.readUnsignedShort(); + this.walkRightSequence = var1.readUnsignedShort(); } else if (var2 >= 30 && var2 < 35) { this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { @@ -331,7 +331,7 @@ public class NPCDefinition extends DualNode { } else if (var2 == 111) { this.isFollower = true; } else if (var2 == 249) { - this.params = AbstractIndexCache.readStringIntParameters(var1, this.params); + this.params = AbstractArchive.readStringIntParameters(var1, this.params); } } else { this.transformVarbit = var1.readUnsignedShort(); @@ -382,8 +382,8 @@ public class NPCDefinition extends DualNode { if (var5 == null) { boolean var6 = false; - for (int var7 = 0; var7 < this.archives.length; ++var7) { - if (!NpcDefinition_modelIndexCache.tryLoadRecord(this.archives[var7], 0)) { + for (int var7 = 0; var7 < this.models.length; ++var7) { + if (!NpcDefinition_modelArchive.tryLoadFile(this.models[var7], 0)) { var6 = true; } } @@ -392,11 +392,11 @@ public class NPCDefinition extends DualNode { return null; } - ModelData[] var12 = new ModelData[this.archives.length]; + ModelData[] var12 = new ModelData[this.models.length]; int var8; - for (var8 = 0; var8 < this.archives.length; ++var8) { - var12[var8] = ModelData.method2788(NpcDefinition_modelIndexCache, this.archives[var8], 0); + for (var8 = 0; var8 < this.models.length; ++var8) { + var12[var8] = ModelData.method2788(NpcDefinition_modelArchive, this.models[var8], 0); } ModelData var9; @@ -457,7 +457,7 @@ public class NPCDefinition extends DualNode { boolean var1 = false; for (int var2 = 0; var2 < this.field636.length; ++var2) { - if (!NpcDefinition_modelIndexCache.tryLoadRecord(this.field636[var2], 0)) { + if (!NpcDefinition_modelArchive.tryLoadFile(this.field636[var2], 0)) { var1 = true; } } @@ -468,7 +468,7 @@ public class NPCDefinition extends DualNode { ModelData[] var6 = new ModelData[this.field636.length]; for (int var3 = 0; var3 < this.field636.length; ++var3) { - var6[var3] = ModelData.method2788(NpcDefinition_modelIndexCache, this.field636[var3], 0); + var6[var3] = ModelData.method2788(NpcDefinition_modelArchive, this.field636[var3], 0); } ModelData var7; diff --git a/runescape-client/src/main/java/NanoClock.java b/runescape-client/src/main/java/NanoClock.java index d7c216de4e..27dda9d57e 100644 --- a/runescape-client/src/main/java/NanoClock.java +++ b/runescape-client/src/main/java/NanoClock.java @@ -34,8 +34,8 @@ public class NanoClock extends Clock { garbageValue = "-126803683" ) @Export("wait") - public int wait(int var1, int var2) { - long var3 = 1000000L * (long)var2; + public int wait(int cycleMs, int minSleepMs) { + long var3 = 1000000L * (long)minSleepMs; long var5 = this.lastTimeNano - System.nanoTime(); if (var5 < var3) { var5 = var3; @@ -45,7 +45,7 @@ public class NanoClock extends Clock { long var7 = System.nanoTime(); int var9; - for (var9 = 0; var9 < 10 && (var9 < 1 || this.lastTimeNano < var7); this.lastTimeNano += 1000000L * (long)var1) { + for (var9 = 0; var9 < 10 && (var9 < 1 || this.lastTimeNano < var7); this.lastTimeNano += 1000000L * (long)cycleMs) { ++var9; } diff --git a/runescape-client/src/main/java/NetCache.java b/runescape-client/src/main/java/NetCache.java index a4c6dfc5c5..8373742355 100644 --- a/runescape-client/src/main/java/NetCache.java +++ b/runescape-client/src/main/java/NetCache.java @@ -96,8 +96,8 @@ public class NetCache { @ObfuscatedSignature( signature = "[Lit;" ) - @Export("NetCache_indexCaches") - public static IndexCache[] NetCache_indexCaches; + @Export("NetCache_archives") + public static Archive[] NetCache_archives; @ObfuscatedName("b") public static byte field631; @ObfuscatedName("c") @@ -136,7 +136,7 @@ public class NetCache { NetCache_responseHeaderBuffer = new Buffer(8); field630 = 0; NetCache_crc = new CRC32(); - NetCache_indexCaches = new IndexCache[256]; + NetCache_archives = new Archive[256]; field631 = 0; NetCache_crcMismatches = 0; NetCache_ioExceptions = 0; diff --git a/runescape-client/src/main/java/NetFileRequest.java b/runescape-client/src/main/java/NetFileRequest.java index 03b741230c..da43e7940b 100644 --- a/runescape-client/src/main/java/NetFileRequest.java +++ b/runescape-client/src/main/java/NetFileRequest.java @@ -11,8 +11,8 @@ public class NetFileRequest extends DualNode { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache") - public IndexCache indexCache; + @Export("archive") + public Archive archive; @ObfuscatedName("f") @ObfuscatedGetter( intValue = 1487103265 @@ -42,7 +42,7 @@ public class NetFileRequest extends DualNode { method4555(var3.children, var3.id); } - WidgetGroupParent var4 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var3.id); + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); if (var4 != null) { ClientPreferences.method1809(var4.group); } @@ -96,7 +96,7 @@ public class NetFileRequest extends DualNode { ) static final void method4554(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) { if (var4 != null) { - int var6 = Client.minimapOrientation & 2047; + int var6 = Client.camAngleY & 2047; int var7 = var3 * var3 + var2 * var2; if (var7 <= 6400) { int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java index ae8947b0d5..2907e27c90 100644 --- a/runescape-client/src/main/java/NetSocket.java +++ b/runescape-client/src/main/java/NetSocket.java @@ -95,8 +95,8 @@ public final class NetSocket extends AbstractSocket implements Runnable { garbageValue = "1765046516" ) @Export("isAvailable") - public boolean isAvailable(int var1) throws IOException { - return this.isClosed ? false : this.inputStream.available() >= var1; + public boolean isAvailable(int length) throws IOException { + return this.isClosed ? false : this.inputStream.available() >= length; } @ObfuscatedName("q") @@ -125,19 +125,19 @@ public final class NetSocket extends AbstractSocket implements Runnable { garbageValue = "-1089665746" ) @Export("read") - public int read(byte[] var1, int var2, int var3) throws IOException { + public int read(byte[] dst, int dstIndex, int length) throws IOException { if (this.isClosed) { return 0; } else { int var4; int var5; - for (var4 = var3; var3 > 0; var3 -= var5) { - var5 = this.inputStream.read(var1, var2, var3); + for (var4 = length; length > 0; length -= var5) { + var5 = this.inputStream.read(dst, dstIndex, length); if (var5 <= 0) { throw new EOFException(); } - var2 += var5; + dstIndex += var5; } return var4; @@ -150,8 +150,8 @@ public final class NetSocket extends AbstractSocket implements Runnable { garbageValue = "-86" ) @Export("write") - public void write(byte[] var1, int var2, int var3) throws IOException { - this.write0(var1, var2, var3); + public void write(byte[] src, int srcIndex, int length) throws IOException { + this.write0(src, srcIndex, length); } @ObfuscatedName("g") @@ -191,7 +191,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { garbageValue = "-77" ) @Export("write0") - void write0(byte[] var1, int var2, int var3) throws IOException { + void write0(byte[] src, int srcIndex, int length) throws IOException { if (!this.isClosed) { if (this.exceptionWriting) { this.exceptionWriting = false; @@ -203,8 +203,8 @@ public final class NetSocket extends AbstractSocket implements Runnable { } synchronized(this) { - for (int var5 = 0; var5 < var3; ++var5) { - this.array[this.field633] = var1[var5 + var2]; + for (int var5 = 0; var5 < length; ++var5) { + this.array[this.field633] = src[var5 + srcIndex]; this.field633 = (this.field633 + 1) % this.field634; if ((this.field635 + this.field632) % this.field634 == this.field633) { throw new IOException(); @@ -221,8 +221,6 @@ public final class NetSocket extends AbstractSocket implements Runnable { } - @Export("run") - @ObfuscatedName("run") public void run() { try { while (true) { @@ -347,103 +345,104 @@ public final class NetSocket extends AbstractSocket implements Runnable { int[][] var24 = var4.flags; boolean var25; - label226: { - while (var21 != var14) { - var9 = class178.bufferX[var14]; - var10 = class178.bufferY[var14]; - var14 = var14 + 1 & 4095; - var19 = var9 - var12; - var20 = var10 - var13; - var15 = var9 - var4.xInset; - var16 = var10 - var4.yInset; - if (var3.vmethod3644(1, var9, var10, var4)) { - WidgetGroupParent.field986 = var9; - UrlRequester.field929 = var10; - var25 = true; - break label226; - } - - var17 = class178.distances[var19][var20] + 1; - if (var19 > 0 && class178.directions[var19 - 1][var20] == 0 && (var24[var15 - 1][var16] & 19136776) == 0) { - class178.bufferX[var21] = var9 - 1; - class178.bufferY[var21] = var10; - var21 = var21 + 1 & 4095; - class178.directions[var19 - 1][var20] = 2; - class178.distances[var19 - 1][var20] = var17; - } - - if (var19 < 127 && class178.directions[var19 + 1][var20] == 0 && (var24[var15 + 1][var16] & 19136896) == 0) { - class178.bufferX[var21] = var9 + 1; - class178.bufferY[var21] = var10; - var21 = var21 + 1 & 4095; - class178.directions[var19 + 1][var20] = 8; - class178.distances[var19 + 1][var20] = var17; - } - - if (var20 > 0 && class178.directions[var19][var20 - 1] == 0 && (var24[var15][var16 - 1] & 19136770) == 0) { - class178.bufferX[var21] = var9; - class178.bufferY[var21] = var10 - 1; - var21 = var21 + 1 & 4095; - class178.directions[var19][var20 - 1] = 1; - class178.distances[var19][var20 - 1] = var17; - } - - if (var20 < 127 && class178.directions[var19][var20 + 1] == 0 && (var24[var15][var16 + 1] & 19136800) == 0) { - class178.bufferX[var21] = var9; - class178.bufferY[var21] = var10 + 1; - var21 = var21 + 1 & 4095; - class178.directions[var19][var20 + 1] = 4; - class178.distances[var19][var20 + 1] = var17; - } - - if (var19 > 0 && var20 > 0 && class178.directions[var19 - 1][var20 - 1] == 0 && (var24[var15 - 1][var16 - 1] & 19136782) == 0 && (var24[var15 - 1][var16] & 19136776) == 0 && (var24[var15][var16 - 1] & 19136770) == 0) { - class178.bufferX[var21] = var9 - 1; - class178.bufferY[var21] = var10 - 1; - var21 = var21 + 1 & 4095; - class178.directions[var19 - 1][var20 - 1] = 3; - class178.distances[var19 - 1][var20 - 1] = var17; - } - - if (var19 < 127 && var20 > 0 && class178.directions[var19 + 1][var20 - 1] == 0 && (var24[var15 + 1][var16 - 1] & 19136899) == 0 && (var24[var15 + 1][var16] & 19136896) == 0 && (var24[var15][var16 - 1] & 19136770) == 0) { - class178.bufferX[var21] = var9 + 1; - class178.bufferY[var21] = var10 - 1; - var21 = var21 + 1 & 4095; - class178.directions[var19 + 1][var20 - 1] = 9; - class178.distances[var19 + 1][var20 - 1] = var17; - } - - if (var19 > 0 && var20 < 127 && class178.directions[var19 - 1][var20 + 1] == 0 && (var24[var15 - 1][var16 + 1] & 19136824) == 0 && (var24[var15 - 1][var16] & 19136776) == 0 && (var24[var15][var16 + 1] & 19136800) == 0) { - class178.bufferX[var21] = var9 - 1; - class178.bufferY[var21] = var10 + 1; - var21 = var21 + 1 & 4095; - class178.directions[var19 - 1][var20 + 1] = 6; - class178.distances[var19 - 1][var20 + 1] = var17; - } - - if (var19 < 127 && var20 < 127 && class178.directions[var19 + 1][var20 + 1] == 0 && (var24[var15 + 1][var16 + 1] & 19136992) == 0 && (var24[var15 + 1][var16] & 19136896) == 0 && (var24[var15][var16 + 1] & 19136800) == 0) { - class178.bufferX[var21] = var9 + 1; - class178.bufferY[var21] = var10 + 1; - var21 = var21 + 1 & 4095; - class178.directions[var19 + 1][var20 + 1] = 12; - class178.distances[var19 + 1][var20 + 1] = var17; - } + while (true) { + if (var21 == var14) { + InterfaceParent.field986 = var9; + UrlRequester.field929 = var10; + var25 = false; + break; } - WidgetGroupParent.field986 = var9; - UrlRequester.field929 = var10; - var25 = false; + var9 = class178.bufferX[var14]; + var10 = class178.bufferY[var14]; + var14 = var14 + 1 & 4095; + var19 = var9 - var12; + var20 = var10 - var13; + var15 = var9 - var4.xInset; + var16 = var10 - var4.yInset; + if (var3.vmethod3644(1, var9, var10, var4)) { + InterfaceParent.field986 = var9; + UrlRequester.field929 = var10; + var25 = true; + break; + } + + var17 = class178.distances[var19][var20] + 1; + if (var19 > 0 && class178.directions[var19 - 1][var20] == 0 && (var24[var15 - 1][var16] & 19136776) == 0) { + class178.bufferX[var21] = var9 - 1; + class178.bufferY[var21] = var10; + var21 = var21 + 1 & 4095; + class178.directions[var19 - 1][var20] = 2; + class178.distances[var19 - 1][var20] = var17; + } + + if (var19 < 127 && class178.directions[var19 + 1][var20] == 0 && (var24[var15 + 1][var16] & 19136896) == 0) { + class178.bufferX[var21] = var9 + 1; + class178.bufferY[var21] = var10; + var21 = var21 + 1 & 4095; + class178.directions[var19 + 1][var20] = 8; + class178.distances[var19 + 1][var20] = var17; + } + + if (var20 > 0 && class178.directions[var19][var20 - 1] == 0 && (var24[var15][var16 - 1] & 19136770) == 0) { + class178.bufferX[var21] = var9; + class178.bufferY[var21] = var10 - 1; + var21 = var21 + 1 & 4095; + class178.directions[var19][var20 - 1] = 1; + class178.distances[var19][var20 - 1] = var17; + } + + if (var20 < 127 && class178.directions[var19][var20 + 1] == 0 && (var24[var15][var16 + 1] & 19136800) == 0) { + class178.bufferX[var21] = var9; + class178.bufferY[var21] = var10 + 1; + var21 = var21 + 1 & 4095; + class178.directions[var19][var20 + 1] = 4; + class178.distances[var19][var20 + 1] = var17; + } + + if (var19 > 0 && var20 > 0 && class178.directions[var19 - 1][var20 - 1] == 0 && (var24[var15 - 1][var16 - 1] & 19136782) == 0 && (var24[var15 - 1][var16] & 19136776) == 0 && (var24[var15][var16 - 1] & 19136770) == 0) { + class178.bufferX[var21] = var9 - 1; + class178.bufferY[var21] = var10 - 1; + var21 = var21 + 1 & 4095; + class178.directions[var19 - 1][var20 - 1] = 3; + class178.distances[var19 - 1][var20 - 1] = var17; + } + + if (var19 < 127 && var20 > 0 && class178.directions[var19 + 1][var20 - 1] == 0 && (var24[var15 + 1][var16 - 1] & 19136899) == 0 && (var24[var15 + 1][var16] & 19136896) == 0 && (var24[var15][var16 - 1] & 19136770) == 0) { + class178.bufferX[var21] = var9 + 1; + class178.bufferY[var21] = var10 - 1; + var21 = var21 + 1 & 4095; + class178.directions[var19 + 1][var20 - 1] = 9; + class178.distances[var19 + 1][var20 - 1] = var17; + } + + if (var19 > 0 && var20 < 127 && class178.directions[var19 - 1][var20 + 1] == 0 && (var24[var15 - 1][var16 + 1] & 19136824) == 0 && (var24[var15 - 1][var16] & 19136776) == 0 && (var24[var15][var16 + 1] & 19136800) == 0) { + class178.bufferX[var21] = var9 - 1; + class178.bufferY[var21] = var10 + 1; + var21 = var21 + 1 & 4095; + class178.directions[var19 - 1][var20 + 1] = 6; + class178.distances[var19 - 1][var20 + 1] = var17; + } + + if (var19 < 127 && var20 < 127 && class178.directions[var19 + 1][var20 + 1] == 0 && (var24[var15 + 1][var16 + 1] & 19136992) == 0 && (var24[var15 + 1][var16] & 19136896) == 0 && (var24[var15][var16 + 1] & 19136800) == 0) { + class178.bufferX[var21] = var9 + 1; + class178.bufferY[var21] = var10 + 1; + var21 = var21 + 1 & 4095; + class178.directions[var19 + 1][var20 + 1] = 12; + class178.distances[var19 + 1][var20 + 1] = var17; + } } var18 = var25; } else if (var2 == 2) { var18 = WorldMapSection2.method593(var0, var1, var3, var4); } else { - var18 = IndexStore.method3585(var0, var1, var2, var3, var4); + var18 = ArchiveDisk.method3585(var0, var1, var2, var3, var4); } var8 = var0 - 64; var9 = var1 - 64; - var10 = WidgetGroupParent.field986; + var10 = InterfaceParent.field986; var19 = UrlRequester.field929; if (!var18) { var20 = Integer.MAX_VALUE; @@ -536,7 +535,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { signature = "(Lir;Lir;Lir;Lhm;I)Z", garbageValue = "-590103687" ) - public static boolean method3537(AbstractIndexCache var0, AbstractIndexCache var1, AbstractIndexCache var2, MidiPcmStream var3) { + public static boolean method3537(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, MidiPcmStream var3) { class1.field1105 = var0; class214.field1127 = var1; class214.field1128 = var2; diff --git a/runescape-client/src/main/java/NodeDeque.java b/runescape-client/src/main/java/NodeDeque.java index 6fb4ab6338..b7d3eb37a3 100644 --- a/runescape-client/src/main/java/NodeDeque.java +++ b/runescape-client/src/main/java/NodeDeque.java @@ -44,15 +44,15 @@ public class NodeDeque { signature = "(Lgw;)V" ) @Export("addFirst") - public void addFirst(Node var1) { - if (var1.next != null) { - var1.remove(); + public void addFirst(Node node) { + if (node.next != null) { + node.remove(); } - var1.next = this.sentinel.next; - var1.previous = this.sentinel; - var1.next.previous = var1; - var1.previous.next = var1; + node.next = this.sentinel.next; + node.previous = this.sentinel; + node.next.previous = node; + node.previous.next = node; } @ObfuscatedName("q") @@ -60,15 +60,15 @@ public class NodeDeque { signature = "(Lgw;)V" ) @Export("addLast") - public void addLast(Node var1) { - if (var1.next != null) { - var1.remove(); + public void addLast(Node node) { + if (node.next != null) { + node.remove(); } - var1.next = this.sentinel; - var1.previous = this.sentinel.previous; - var1.next.previous = var1; - var1.previous.next = var1; + node.next = this.sentinel; + node.previous = this.sentinel.previous; + node.next.previous = node; + node.previous.next = node; } @ObfuscatedName("o") diff --git a/runescape-client/src/main/java/NodeHashTable.java b/runescape-client/src/main/java/NodeHashTable.java index ae81442438..d2f8c773d8 100644 --- a/runescape-client/src/main/java/NodeHashTable.java +++ b/runescape-client/src/main/java/NodeHashTable.java @@ -49,11 +49,11 @@ public final class NodeHashTable { signature = "(J)Lgw;" ) @Export("get") - public Node get(long var1) { - Node var3 = this.buckets[(int)(var1 & (long)(this.size - 1))]; + public Node get(long key) { + Node var3 = this.buckets[(int)(key & (long)(this.size - 1))]; for (this.currentGet = var3.previous; var3 != this.currentGet; this.currentGet = this.currentGet.previous) { - if (this.currentGet.key == var1) { + if (this.currentGet.key == key) { Node var4 = this.currentGet; this.currentGet = this.currentGet.previous; return var4; @@ -69,17 +69,17 @@ public final class NodeHashTable { signature = "(Lgw;J)V" ) @Export("put") - public void put(Node var1, long var2) { - if (var1.next != null) { - var1.remove(); + public void put(Node node, long key) { + if (node.next != null) { + node.remove(); } - Node var4 = this.buckets[(int)(var2 & (long)(this.size - 1))]; - var1.next = var4.next; - var1.previous = var4; - var1.next.previous = var1; - var1.previous.next = var1; - var1.key = var2; + Node var4 = this.buckets[(int)(key & (long)(this.size - 1))]; + node.next = var4.next; + node.previous = var4; + node.next.previous = node; + node.previous.next = node; + node.key = key; } @ObfuscatedName("q") @@ -124,15 +124,16 @@ public final class NodeHashTable { this.current = var1.previous; return var1; } else { - while (this.index < this.size) { - var1 = this.buckets[this.index++].previous; - if (var1 != this.buckets[this.index - 1]) { - this.current = var1.previous; - return var1; + do { + if (this.index >= this.size) { + return null; } - } - return null; + var1 = this.buckets[this.index++].previous; + } while(var1 == this.buckets[this.index - 1]); + + this.current = var1.previous; + return var1; } } } diff --git a/runescape-client/src/main/java/ObjectDefinition.java b/runescape-client/src/main/java/ObjectDefinition.java index 47fa02edef..2610044c34 100644 --- a/runescape-client/src/main/java/ObjectDefinition.java +++ b/runescape-client/src/main/java/ObjectDefinition.java @@ -14,13 +14,13 @@ public class ObjectDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("ObjectDefinition_indexCache") - static AbstractIndexCache ObjectDefinition_indexCache; + @Export("ObjectDefinition_archive") + static AbstractArchive ObjectDefinition_archive; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lir;" ) - static AbstractIndexCache field640; + static AbstractArchive field640; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Ler;" @@ -218,8 +218,8 @@ public class ObjectDefinition extends DualNode { @ObfuscatedGetter( intValue = -2119965579 ) - @Export("transformConfigId") - int transformConfigId; + @Export("transformVarp") + int transformVarp; @ObfuscatedName("az") @ObfuscatedGetter( intValue = 374616127 @@ -282,7 +282,7 @@ public class ObjectDefinition extends DualNode { this.isSolid = false; this.int3 = -1; this.transformVarbit = -1; - this.transformConfigId = -1; + this.transformVarp = -1; this.ambientSoundId = -1; this.int4 = 0; this.int5 = 0; @@ -294,8 +294,8 @@ public class ObjectDefinition extends DualNode { signature = "(I)V", garbageValue = "-245255765" ) - @Export("init") - void init() { + @Export("postDecode") + void postDecode() { if (this.int1 == -1) { this.int1 = 0; if (this.field644 != null && (this.field645 == null || this.field645[0] == 10)) { @@ -320,15 +320,15 @@ public class ObjectDefinition extends DualNode { signature = "(Lgr;I)V", garbageValue = "1210669830" ) - @Export("read") - void read(Buffer var1) { + @Export("decode") + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -337,8 +337,8 @@ public class ObjectDefinition extends DualNode { signature = "(Lgr;II)V", garbageValue = "-2044409717" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { int var3; int var4; if (var2 == 1) { @@ -470,7 +470,7 @@ public class ObjectDefinition extends DualNode { } else if (var2 == 82) { this.mapIconId = var1.readUnsignedShort(); } else if (var2 == 249) { - this.params = AbstractIndexCache.readStringIntParameters(var1, this.params); + this.params = AbstractArchive.readStringIntParameters(var1, this.params); } } else { this.transformVarbit = var1.readUnsignedShort(); @@ -478,9 +478,9 @@ public class ObjectDefinition extends DualNode { this.transformVarbit = -1; } - this.transformConfigId = var1.readUnsignedShort(); - if (this.transformConfigId == 65535) { - this.transformConfigId = -1; + this.transformVarp = var1.readUnsignedShort(); + if (this.transformVarp == 65535) { + this.transformVarp = -1; } var3 = -1; @@ -515,7 +515,7 @@ public class ObjectDefinition extends DualNode { if (this.field645 != null) { for (int var4 = 0; var4 < this.field645.length; ++var4) { if (this.field645[var4] == var1) { - return field640.tryLoadRecord(this.field644[var4] & 65535, 0); + return field640.tryLoadFile(this.field644[var4] & 65535, 0); } } @@ -528,7 +528,7 @@ public class ObjectDefinition extends DualNode { boolean var2 = true; for (int var3 = 0; var3 < this.field644.length; ++var3) { - var2 &= field640.tryLoadRecord(this.field644[var3] & 65535, 0); + var2 &= field640.tryLoadFile(this.field644[var3] & 65535, 0); } return var2; @@ -547,7 +547,7 @@ public class ObjectDefinition extends DualNode { boolean var1 = true; for (int var2 = 0; var2 < this.field644.length; ++var2) { - var1 &= field640.tryLoadRecord(this.field644[var2] & 65535, 0); + var1 &= field640.tryLoadFile(this.field644[var2] & 65535, 0); } return var1; @@ -687,6 +687,7 @@ public class ObjectDefinition extends DualNode { int var5; int var6; int var7; + boolean var8; if (this.field645 == null) { if (var1 != 10) { return null; @@ -746,7 +747,7 @@ public class ObjectDefinition extends DualNode { } var5 = this.field644[var7]; - boolean var8 = this.isRotated ^ var2 > 3; + var8 = this.isRotated ^ var2 > 3; if (var8) { var5 += 65536; } @@ -772,14 +773,13 @@ public class ObjectDefinition extends DualNode { var4 = true; } - boolean var10; if (this.offsetX == 0 && this.offsetHeight == 0 && this.offsetY == 0) { - var10 = false; + var8 = false; } else { - var10 = true; + var8 = true; } - ModelData var9 = new ModelData(var3, var2 == 0 && !var4 && !var10, this.recolorFrom == null, null == this.retextureFrom, true); + ModelData var9 = new ModelData(var3, var2 == 0 && !var4 && !var8, this.recolorFrom == null, null == this.retextureFrom, true); if (var1 == 4 && var2 > 3) { var9.method212(256); var9.method213(45, 0, -45); @@ -810,7 +810,7 @@ public class ObjectDefinition extends DualNode { var9.method215(this.modelSizeX, this.modelHeight, this.modelSizeY); } - if (var10) { + if (var8) { var9.method213(this.offsetX, this.offsetHeight, this.offsetY); } @@ -827,8 +827,8 @@ public class ObjectDefinition extends DualNode { int var1 = -1; if (this.transformVarbit != -1) { var1 = WorldMapSection2.getVarbit(this.transformVarbit); - } else if (this.transformConfigId != -1) { - var1 = Varps.Varps_main[this.transformConfigId]; + } else if (this.transformVarp != -1) { + var1 = Varps.Varps_main[this.transformVarp]; } int var2; @@ -907,14 +907,14 @@ public class ObjectDefinition extends DualNode { if (var1 != null) { return var1; } else { - byte[] var2 = NPCDefinition.NpcDefinition_indexCache.takeRecord(9, var0); + byte[] var2 = NPCDefinition.NpcDefinition_archive.takeFile(9, var0); var1 = new NPCDefinition(); var1.id = var0; if (var2 != null) { - var1.read(new Buffer(var2)); + var1.decode(new Buffer(var2)); } - var1.init(); + var1.postDecode(); NPCDefinition.NpcDefinition_cached.put(var1, (long)var0); return var1; } diff --git a/runescape-client/src/main/java/ObjectSound.java b/runescape-client/src/main/java/ObjectSound.java index 1fb50a8cb5..f9a0dde47d 100644 --- a/runescape-client/src/main/java/ObjectSound.java +++ b/runescape-client/src/main/java/ObjectSound.java @@ -17,8 +17,8 @@ public final class ObjectSound extends Node { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache2") - static IndexCache indexCache2; + @Export("archive2") + static Archive archive2; @ObfuscatedName("f") @ObfuscatedGetter( intValue = 647270745 diff --git a/runescape-client/src/main/java/Occluder.java b/runescape-client/src/main/java/Occluder.java index 0569ab5f5c..67ba4151a0 100644 --- a/runescape-client/src/main/java/Occluder.java +++ b/runescape-client/src/main/java/Occluder.java @@ -119,10 +119,10 @@ public final class Occluder { if (var1 != null) { return var1; } else { - byte[] var2 = VarbitDefinition.VarbitDefinition_indexCache.takeRecord(14, var0); + byte[] var2 = VarbitDefinition.VarbitDefinition_archive.takeFile(14, var0); var1 = new VarbitDefinition(); if (var2 != null) { - var1.read(new Buffer(var2)); + var1.decode(new Buffer(var2)); } VarbitDefinition.VarbitDefinition_cached.put(var1, (long)var0); @@ -136,9 +136,9 @@ public final class Occluder { garbageValue = "-1164060583" ) @Export("newScript") - static Script newScript(byte[] var0) { + static Script newScript(byte[] bytes) { Script var1 = new Script(); - Buffer var2 = new Buffer(var0); + Buffer var2 = new Buffer(bytes); var2.index = var2.array.length - 2; int var3 = var2.readUnsignedShort(); int var4 = var2.array.length - 2 - var3 - 12; diff --git a/runescape-client/src/main/java/PacketBuffer.java b/runescape-client/src/main/java/PacketBuffer.java index b4985caf88..562ce452d3 100644 --- a/runescape-client/src/main/java/PacketBuffer.java +++ b/runescape-client/src/main/java/PacketBuffer.java @@ -38,8 +38,8 @@ public final class PacketBuffer extends Buffer { garbageValue = "-763699765" ) @Export("newIsaacCipher") - public void newIsaacCipher(int[] var1) { - this.isaacCipher0 = new IsaacCipher(var1); + public void newIsaacCipher(int[] array) { + this.isaacCipher0 = new IsaacCipher(array); } @ObfuscatedName("ih") @@ -48,8 +48,8 @@ public final class PacketBuffer extends Buffer { garbageValue = "0" ) @Export("setIsaacCipher") - public void setIsaacCipher(IsaacCipher var1) { - this.isaacCipher0 = var1; + public void setIsaacCipher(IsaacCipher isaacCipher) { + this.isaacCipher0 = isaacCipher; } @ObfuscatedName("im") @@ -121,20 +121,20 @@ public final class PacketBuffer extends Buffer { garbageValue = "1710439720" ) @Export("readBits") - public int readBits(int var1) { + public int readBits(int bits) { int var2 = this.bitIndex >> 3; int var3 = 8 - (this.bitIndex & 7); int var4 = 0; - for (this.bitIndex += var1; var1 > var3; var3 = 8) { - var4 += (super.array[var2++] & PacketBuffer_masks[var3]) << var1 - var3; - var1 -= var3; + for (this.bitIndex += bits; bits > var3; var3 = 8) { + var4 += (super.array[var2++] & PacketBuffer_masks[var3]) << bits - var3; + bits -= var3; } - if (var3 == var1) { + if (var3 == bits) { var4 += super.array[var2] & PacketBuffer_masks[var3]; } else { - var4 += super.array[var2] >> var3 - var1 & PacketBuffer_masks[var1]; + var4 += super.array[var2] >> var3 - bits & PacketBuffer_masks[bits]; } return var4; @@ -156,8 +156,8 @@ public final class PacketBuffer extends Buffer { garbageValue = "-141269845" ) @Export("bitsRemaining") - public int bitsRemaining(int var1) { - return var1 * 8 - this.bitIndex; + public int bitsRemaining(int index) { + return index * 8 - this.bitIndex; } @ObfuscatedName("m") @@ -175,7 +175,7 @@ public final class PacketBuffer extends Buffer { garbageValue = "-1562700981" ) @Export("requestNetFile") - static void requestNetFile(IndexCache var0, int var1, int var2, int var3, byte var4, boolean var5) { + static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) { long var6 = (long)((var1 << 16) + var2); NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); if (var8 == null) { @@ -198,7 +198,7 @@ public final class PacketBuffer extends Buffer { } var8 = new NetFileRequest(); - var8.indexCache = var0; + var8.archive = var0; var8.crc = var3; var8.padding = var4; if (var5) { diff --git a/runescape-client/src/main/java/PacketWriter.java b/runescape-client/src/main/java/PacketWriter.java index ea0c467d30..56fe4d7e67 100644 --- a/runescape-client/src/main/java/PacketWriter.java +++ b/runescape-client/src/main/java/PacketWriter.java @@ -156,8 +156,8 @@ public class PacketWriter { garbageValue = "111" ) @Export("setSocket") - void setSocket(AbstractSocket var1) { - this.socket0 = var1; + void setSocket(AbstractSocket socket) { + this.socket0 = socket; } @ObfuscatedName("o") diff --git a/runescape-client/src/main/java/ParamDefinition.java b/runescape-client/src/main/java/ParamDefinition.java new file mode 100644 index 0000000000..dc7c2c46d0 --- /dev/null +++ b/runescape-client/src/main/java/ParamDefinition.java @@ -0,0 +1,398 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("jb") +@Implements("ParamDefinition") +public class ParamDefinition extends DualNode { + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "Lir;" + ) + @Export("ParamDefinition_archive") + public static AbstractArchive ParamDefinition_archive; + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "Ler;" + ) + @Export("ParamDefinition_cached") + static EvictingDualNodeHashTable ParamDefinition_cached; + @ObfuscatedName("q") + @Export("type") + char type; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = 1133042753 + ) + @Export("defaultInt") + public int defaultInt; + @ObfuscatedName("o") + @Export("defaultStr") + public String defaultStr; + @ObfuscatedName("u") + @Export("autoDisable") + boolean autoDisable; + + ParamDefinition() { + this.autoDisable = true; + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "121" + ) + @Export("postDecode") + void postDecode() { + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "(Lgr;I)V", + garbageValue = "-975533635" + ) + @Export("decode") + void decode(Buffer var1) { + while (true) { + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { + return; + } + + this.decodeNext(var1, var2); + } + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "(Lgr;II)V", + garbageValue = "1664350313" + ) + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { + if (var2 == 1) { + this.type = class14.method171(var1.readByte()); + } else if (var2 == 2) { + this.defaultInt = var1.readInt(); + } else if (var2 == 4) { + this.autoDisable = false; + } else if (var2 == 5) { + this.defaultStr = var1.readStringCp1252NullTerminated(); + } + + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(I)Z", + garbageValue = "-1897943299" + ) + @Export("isString") + public boolean isString() { + return this.type == 's'; + } + + @ObfuscatedName("hs") + @ObfuscatedSignature( + signature = "(IIIIIIII)V", + garbageValue = "-904254947" + ) + @Export("addPendingSpawnToScene") + static final void addPendingSpawnToScene(int plane, int objectType, int x, int y, int id, int orientation, int var6) { + if (x >= 1 && y >= 1 && x <= 102 && y <= 102) { + if (Client.isLowDetail && plane != SoundSystem.plane) { + return; + } + + long var7 = 0L; + boolean var9 = true; + boolean var10 = false; + boolean var11 = false; + if (objectType == 0) { + var7 = class65.scene.getBoundaryObjectTag(plane, x, y); + } + + if (objectType == 1) { + var7 = class65.scene.getWallDecorationTag(plane, x, y); + } + + if (objectType == 2) { + var7 = class65.scene.getGameObjectTag(plane, x, y); + } + + if (objectType == 3) { + var7 = class65.scene.getFloorDecorationTag(plane, x, y); + } + + int var12; + if (0L != var7) { + var12 = class65.scene.getObjectFlags(plane, x, y, var7); + int var13 = HitSplatDefinition.method4972(var7); + int var14 = var12 & 31; + int var15 = var12 >> 6 & 3; + ObjectDefinition var16; + if (objectType == 0) { + class65.scene.removeBoundaryObject(plane, x, y); + var16 = class50.getObjectDefinition(var13); + if (var16.interactType != 0) { + Client.collisionMaps[plane].method95(x, y, var14, var15, var16.boolean1); + } + } + + if (objectType == 1) { + class65.scene.removeWallDecoration(plane, x, y); + } + + if (objectType == 2) { + class65.scene.method288(plane, x, y); + var16 = class50.getObjectDefinition(var13); + if (x + var16.sizeX > 103 || y + var16.sizeX > 103 || x + var16.sizeY > 103 || y + var16.sizeY > 103) { + return; + } + + if (var16.interactType != 0) { + Client.collisionMaps[plane].method96(x, y, var16.sizeX, var16.sizeY, var15, var16.boolean1); + } + } + + if (objectType == 3) { + class65.scene.removeFloorDecoration(plane, x, y); + var16 = class50.getObjectDefinition(var13); + if (var16.interactType == 1) { + Client.collisionMaps[plane].method98(x, y); + } + } + } + + if (id >= 0) { + var12 = plane; + if (plane < 3 && (Tiles.Tiles_renderFlags[1][x][y] & 2) == 2) { + var12 = plane + 1; + } + + Scene var36 = class65.scene; + CollisionMap var37 = Client.collisionMaps[plane]; + ObjectDefinition var38 = class50.getObjectDefinition(id); + int var17; + int var39; + if (orientation != 1 && orientation != 3) { + var17 = var38.sizeX; + var39 = var38.sizeY; + } else { + var17 = var38.sizeY; + var39 = var38.sizeX; + } + + int var18; + int var19; + if (var17 + x <= 104) { + var18 = (var17 >> 1) + x; + var19 = x + (var17 + 1 >> 1); + } else { + var18 = x; + var19 = x + 1; + } + + int var20; + int var21; + if (y + var39 <= 104) { + var20 = y + (var39 >> 1); + var21 = y + (var39 + 1 >> 1); + } else { + var20 = y; + var21 = y + 1; + } + + int[][] var22 = Tiles.Tiles_heights[var12]; + int var23 = var22[var18][var21] + var22[var19][var20] + var22[var18][var20] + var22[var19][var21] >> 2; + int var24 = (x << 7) + (var17 << 6); + int var25 = (y << 7) + (var39 << 6); + long var26 = FontName.calculateTag(x, y, 2, var38.int1 == 0, id); + int var28 = (orientation << 6) + var6; + if (var38.int3 == 1) { + var28 += 256; + } + + Object var29; + if (var6 == 22) { + if (var38.animationId == -1 && var38.transforms == null) { + var29 = var38.getModel(22, orientation, var22, var24, var23, var25); + } else { + var29 = new DynamicObject(id, 22, orientation, var12, x, y, var38.animationId, true, (Entity)null); + } + + var36.newFloorDecoration(plane, x, y, var23, (Entity)var29, var26, var28); + if (var38.interactType == 1) { + var37.method93(x, y); + } + } else if (var6 != 10 && var6 != 11) { + if (var6 >= 12) { + if (var38.animationId == -1 && var38.transforms == null) { + var29 = var38.getModel(var6, orientation, var22, var24, var23, var25); + } else { + var29 = new DynamicObject(id, var6, orientation, var12, x, y, var38.animationId, true, (Entity)null); + } + + var36.method284(plane, x, y, var23, 1, 1, (Entity)var29, 0, var26, var28); + if (var38.interactType != 0) { + var37.method91(x, y, var17, var39, var38.boolean1); + } + } else if (var6 == 0) { + if (var38.animationId == -1 && var38.transforms == null) { + var29 = var38.getModel(0, orientation, var22, var24, var23, var25); + } else { + var29 = new DynamicObject(id, 0, orientation, var12, x, y, var38.animationId, true, (Entity)null); + } + + var36.newBoundaryObject(plane, x, y, var23, (Entity)var29, (Entity)null, Tiles.field911[orientation], 0, var26, var28); + if (var38.interactType != 0) { + var37.method90(x, y, var6, orientation, var38.boolean1); + } + } else if (var6 == 1) { + if (var38.animationId == -1 && var38.transforms == null) { + var29 = var38.getModel(1, orientation, var22, var24, var23, var25); + } else { + var29 = new DynamicObject(id, 1, orientation, var12, x, y, var38.animationId, true, (Entity)null); + } + + var36.newBoundaryObject(plane, x, y, var23, (Entity)var29, (Entity)null, Tiles.field912[orientation], 0, var26, var28); + if (var38.interactType != 0) { + var37.method90(x, y, var6, orientation, var38.boolean1); + } + } else { + int var30; + Object var31; + if (var6 == 2) { + var30 = orientation + 1 & 3; + Object var32; + if (var38.animationId == -1 && var38.transforms == null) { + var31 = var38.getModel(2, orientation + 4, var22, var24, var23, var25); + var32 = var38.getModel(2, var30, var22, var24, var23, var25); + } else { + var31 = new DynamicObject(id, 2, orientation + 4, var12, x, y, var38.animationId, true, (Entity)null); + var32 = new DynamicObject(id, 2, var30, var12, x, y, var38.animationId, true, (Entity)null); + } + + var36.newBoundaryObject(plane, x, y, var23, (Entity)var31, (Entity)var32, Tiles.field911[orientation], Tiles.field911[var30], var26, var28); + if (var38.interactType != 0) { + var37.method90(x, y, var6, orientation, var38.boolean1); + } + } else if (var6 == 3) { + if (var38.animationId == -1 && var38.transforms == null) { + var29 = var38.getModel(3, orientation, var22, var24, var23, var25); + } else { + var29 = new DynamicObject(id, 3, orientation, var12, x, y, var38.animationId, true, (Entity)null); + } + + var36.newBoundaryObject(plane, x, y, var23, (Entity)var29, (Entity)null, Tiles.field912[orientation], 0, var26, var28); + if (var38.interactType != 0) { + var37.method90(x, y, var6, orientation, var38.boolean1); + } + } else if (var6 == 9) { + if (var38.animationId == -1 && var38.transforms == null) { + var29 = var38.getModel(var6, orientation, var22, var24, var23, var25); + } else { + var29 = new DynamicObject(id, var6, orientation, var12, x, y, var38.animationId, true, (Entity)null); + } + + var36.method284(plane, x, y, var23, 1, 1, (Entity)var29, 0, var26, var28); + if (var38.interactType != 0) { + var37.method91(x, y, var17, var39, var38.boolean1); + } + } else if (var6 == 4) { + if (var38.animationId == -1 && var38.transforms == null) { + var29 = var38.getModel(4, orientation, var22, var24, var23, var25); + } else { + var29 = new DynamicObject(id, 4, orientation, var12, x, y, var38.animationId, true, (Entity)null); + } + + var36.newWallDecoration(plane, x, y, var23, (Entity)var29, (Entity)null, Tiles.field911[orientation], 0, 0, 0, var26, var28); + } else { + long var40; + if (var6 == 5) { + var30 = 16; + var40 = var36.getBoundaryObjectTag(plane, x, y); + if (var40 != 0L) { + var30 = class50.getObjectDefinition(HitSplatDefinition.method4972(var40)).int2; + } + + if (var38.animationId == -1 && var38.transforms == null) { + var31 = var38.getModel(4, orientation, var22, var24, var23, var25); + } else { + var31 = new DynamicObject(id, 4, orientation, var12, x, y, var38.animationId, true, (Entity)null); + } + + var36.newWallDecoration(plane, x, y, var23, (Entity)var31, (Entity)null, Tiles.field911[orientation], 0, var30 * Tiles.field913[orientation], var30 * Tiles.field914[orientation], var26, var28); + } else if (var6 == 6) { + var30 = 8; + var40 = var36.getBoundaryObjectTag(plane, x, y); + if (var40 != 0L) { + var30 = class50.getObjectDefinition(HitSplatDefinition.method4972(var40)).int2 / 2; + } + + if (var38.animationId == -1 && var38.transforms == null) { + var31 = var38.getModel(4, orientation + 4, var22, var24, var23, var25); + } else { + var31 = new DynamicObject(id, 4, orientation + 4, var12, x, y, var38.animationId, true, (Entity)null); + } + + var36.newWallDecoration(plane, x, y, var23, (Entity)var31, (Entity)null, 256, orientation, var30 * Tiles.field915[orientation], var30 * Tiles.field916[orientation], var26, var28); + } else { + int var34; + if (var6 == 7) { + var34 = orientation + 2 & 3; + if (var38.animationId == -1 && var38.transforms == null) { + var29 = var38.getModel(4, var34 + 4, var22, var24, var23, var25); + } else { + var29 = new DynamicObject(id, 4, var34 + 4, var12, x, y, var38.animationId, true, (Entity)null); + } + + var36.newWallDecoration(plane, x, y, var23, (Entity)var29, (Entity)null, 256, var34, 0, 0, var26, var28); + } else if (var6 == 8) { + var30 = 8; + var40 = var36.getBoundaryObjectTag(plane, x, y); + if (var40 != 0L) { + var30 = class50.getObjectDefinition(HitSplatDefinition.method4972(var40)).int2 / 2; + } + + var34 = orientation + 2 & 3; + Object var35; + if (var38.animationId == -1 && var38.transforms == null) { + var31 = var38.getModel(4, orientation + 4, var22, var24, var23, var25); + var35 = var38.getModel(4, var34 + 4, var22, var24, var23, var25); + } else { + var31 = new DynamicObject(id, 4, orientation + 4, var12, x, y, var38.animationId, true, (Entity)null); + var35 = new DynamicObject(id, 4, var34 + 4, var12, x, y, var38.animationId, true, (Entity)null); + } + + var36.newWallDecoration(plane, x, y, var23, (Entity)var31, (Entity)var35, 256, orientation, var30 * Tiles.field915[orientation], var30 * Tiles.field916[orientation], var26, var28); + } + } + } + } + } else { + if (var38.animationId == -1 && var38.transforms == null) { + var29 = var38.getModel(10, orientation, var22, var24, var23, var25); + } else { + var29 = new DynamicObject(id, 10, orientation, var12, x, y, var38.animationId, true, (Entity)null); + } + + if (var29 != null) { + var36.method284(plane, x, y, var23, var17, var39, (Entity)var29, var6 == 11 ? 256 : 0, var26, var28); + } + + if (var38.interactType != 0) { + var37.method91(x, y, var17, var39, var38.boolean1); + } + } + } + } + + } + + static { + ParamDefinition_cached = new EvictingDualNodeHashTable(64); + } +} diff --git a/runescape-client/src/main/java/ParamKeyDefinition.java b/runescape-client/src/main/java/ParamKeyDefinition.java deleted file mode 100644 index 6e1ae779da..0000000000 --- a/runescape-client/src/main/java/ParamKeyDefinition.java +++ /dev/null @@ -1,396 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("jb") -@Implements("ParamKeyDefinition") -public class ParamKeyDefinition extends DualNode { - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "Lir;" - ) - public static AbstractIndexCache field679; - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "Ler;" - ) - @Export("ParamKeyDefinition_cached") - static EvictingDualNodeHashTable ParamKeyDefinition_cached; - @ObfuscatedName("q") - @Export("type") - char type; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 1133042753 - ) - @Export("keyInt") - public int keyInt; - @ObfuscatedName("o") - @Export("keyString") - public String keyString; - @ObfuscatedName("u") - @Export("isMembersOnly") - boolean isMembersOnly; - - ParamKeyDefinition() { - this.isMembersOnly = true; - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "121" - ) - @Export("init") - void init() { - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "(Lgr;I)V", - garbageValue = "-975533635" - ) - @Export("read") - void read(Buffer var1) { - while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; - } - - this.readNext(var1, var2); - } - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(Lgr;II)V", - garbageValue = "1664350313" - ) - @Export("readNext") - void readNext(Buffer var1, int var2) { - if (var2 == 1) { - this.type = class14.method171(var1.readByte()); - } else if (var2 == 2) { - this.keyInt = var1.readInt(); - } else if (var2 == 4) { - this.isMembersOnly = false; - } else if (var2 == 5) { - this.keyString = var1.readStringCp1252NullTerminated(); - } - - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-1897943299" - ) - @Export("isString") - public boolean isString() { - return this.type == 's'; - } - - @ObfuscatedName("hs") - @ObfuscatedSignature( - signature = "(IIIIIIII)V", - garbageValue = "-904254947" - ) - static final void method4933(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (var2 >= 1 && var3 >= 1 && var2 <= 102 && var3 <= 102) { - if (Client.isLowDetail && var0 != SoundSystem.plane) { - return; - } - - long var7 = 0L; - boolean var9 = true; - boolean var10 = false; - boolean var11 = false; - if (var1 == 0) { - var7 = class65.scene.method290(var0, var2, var3); - } - - if (var1 == 1) { - var7 = class65.scene.method291(var0, var2, var3); - } - - if (var1 == 2) { - var7 = class65.scene.method292(var0, var2, var3); - } - - if (var1 == 3) { - var7 = class65.scene.getFloorDecorationTag(var0, var2, var3); - } - - int var12; - if (0L != var7) { - var12 = class65.scene.getObjectFlags(var0, var2, var3, var7); - int var13 = HitSplatDefinition.method4972(var7); - int var14 = var12 & 31; - int var15 = var12 >> 6 & 3; - ObjectDefinition var16; - if (var1 == 0) { - class65.scene.removeBoundaryObject(var0, var2, var3); - var16 = class50.getObjectDefinition(var13); - if (var16.interactType != 0) { - Client.collisionMaps[var0].method95(var2, var3, var14, var15, var16.boolean1); - } - } - - if (var1 == 1) { - class65.scene.removeWallDecoration(var0, var2, var3); - } - - if (var1 == 2) { - class65.scene.method288(var0, var2, var3); - var16 = class50.getObjectDefinition(var13); - if (var2 + var16.sizeX > 103 || var3 + var16.sizeX > 103 || var2 + var16.sizeY > 103 || var3 + var16.sizeY > 103) { - return; - } - - if (var16.interactType != 0) { - Client.collisionMaps[var0].method96(var2, var3, var16.sizeX, var16.sizeY, var15, var16.boolean1); - } - } - - if (var1 == 3) { - class65.scene.removeFloorDecoration(var0, var2, var3); - var16 = class50.getObjectDefinition(var13); - if (var16.interactType == 1) { - Client.collisionMaps[var0].method98(var2, var3); - } - } - } - - if (var4 >= 0) { - var12 = var0; - if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { - var12 = var0 + 1; - } - - Scene var36 = class65.scene; - CollisionMap var37 = Client.collisionMaps[var0]; - ObjectDefinition var38 = class50.getObjectDefinition(var4); - int var17; - int var39; - if (var5 != 1 && var5 != 3) { - var39 = var38.sizeX; - var17 = var38.sizeY; - } else { - var39 = var38.sizeY; - var17 = var38.sizeX; - } - - int var18; - int var19; - if (var39 + var2 <= 104) { - var18 = (var39 >> 1) + var2; - var19 = var2 + (var39 + 1 >> 1); - } else { - var18 = var2; - var19 = var2 + 1; - } - - int var20; - int var21; - if (var3 + var17 <= 104) { - var20 = var3 + (var17 >> 1); - var21 = var3 + (var17 + 1 >> 1); - } else { - var20 = var3; - var21 = var3 + 1; - } - - int[][] var22 = Tiles.Tiles_heights[var12]; - int var23 = var22[var18][var21] + var22[var19][var20] + var22[var18][var20] + var22[var19][var21] >> 2; - int var24 = (var2 << 7) + (var39 << 6); - int var25 = (var3 << 7) + (var17 << 6); - long var26 = FontName.calculateTag(var2, var3, 2, var38.int1 == 0, var4); - int var28 = (var5 << 6) + var6; - if (var38.int3 == 1) { - var28 += 256; - } - - Object var29; - if (var6 == 22) { - if (var38.animationId == -1 && var38.transforms == null) { - var29 = var38.getModel(22, var5, var22, var24, var23, var25); - } else { - var29 = new DynamicObject(var4, 22, var5, var12, var2, var3, var38.animationId, true, (Entity)null); - } - - var36.newFloorDecoration(var0, var2, var3, var23, (Entity)var29, var26, var28); - if (var38.interactType == 1) { - var37.method93(var2, var3); - } - } else if (var6 != 10 && var6 != 11) { - if (var6 >= 12) { - if (var38.animationId == -1 && var38.transforms == null) { - var29 = var38.getModel(var6, var5, var22, var24, var23, var25); - } else { - var29 = new DynamicObject(var4, var6, var5, var12, var2, var3, var38.animationId, true, (Entity)null); - } - - var36.method284(var0, var2, var3, var23, 1, 1, (Entity)var29, 0, var26, var28); - if (var38.interactType != 0) { - var37.method91(var2, var3, var39, var17, var38.boolean1); - } - } else if (var6 == 0) { - if (var38.animationId == -1 && var38.transforms == null) { - var29 = var38.getModel(0, var5, var22, var24, var23, var25); - } else { - var29 = new DynamicObject(var4, 0, var5, var12, var2, var3, var38.animationId, true, (Entity)null); - } - - var36.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field911[var5], 0, var26, var28); - if (var38.interactType != 0) { - var37.method90(var2, var3, var6, var5, var38.boolean1); - } - } else if (var6 == 1) { - if (var38.animationId == -1 && var38.transforms == null) { - var29 = var38.getModel(1, var5, var22, var24, var23, var25); - } else { - var29 = new DynamicObject(var4, 1, var5, var12, var2, var3, var38.animationId, true, (Entity)null); - } - - var36.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field912[var5], 0, var26, var28); - if (var38.interactType != 0) { - var37.method90(var2, var3, var6, var5, var38.boolean1); - } - } else { - int var30; - Object var31; - if (var6 == 2) { - var30 = var5 + 1 & 3; - Object var32; - if (var38.animationId == -1 && var38.transforms == null) { - var31 = var38.getModel(2, var5 + 4, var22, var24, var23, var25); - var32 = var38.getModel(2, var30, var22, var24, var23, var25); - } else { - var31 = new DynamicObject(var4, 2, var5 + 4, var12, var2, var3, var38.animationId, true, (Entity)null); - var32 = new DynamicObject(var4, 2, var30, var12, var2, var3, var38.animationId, true, (Entity)null); - } - - var36.newBoundaryObject(var0, var2, var3, var23, (Entity)var31, (Entity)var32, Tiles.field911[var5], Tiles.field911[var30], var26, var28); - if (var38.interactType != 0) { - var37.method90(var2, var3, var6, var5, var38.boolean1); - } - } else if (var6 == 3) { - if (var38.animationId == -1 && var38.transforms == null) { - var29 = var38.getModel(3, var5, var22, var24, var23, var25); - } else { - var29 = new DynamicObject(var4, 3, var5, var12, var2, var3, var38.animationId, true, (Entity)null); - } - - var36.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field912[var5], 0, var26, var28); - if (var38.interactType != 0) { - var37.method90(var2, var3, var6, var5, var38.boolean1); - } - } else if (var6 == 9) { - if (var38.animationId == -1 && var38.transforms == null) { - var29 = var38.getModel(var6, var5, var22, var24, var23, var25); - } else { - var29 = new DynamicObject(var4, var6, var5, var12, var2, var3, var38.animationId, true, (Entity)null); - } - - var36.method284(var0, var2, var3, var23, 1, 1, (Entity)var29, 0, var26, var28); - if (var38.interactType != 0) { - var37.method91(var2, var3, var39, var17, var38.boolean1); - } - } else if (var6 == 4) { - if (var38.animationId == -1 && var38.transforms == null) { - var29 = var38.getModel(4, var5, var22, var24, var23, var25); - } else { - var29 = new DynamicObject(var4, 4, var5, var12, var2, var3, var38.animationId, true, (Entity)null); - } - - var36.newWallDecoration(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field911[var5], 0, 0, 0, var26, var28); - } else { - long var40; - if (var6 == 5) { - var30 = 16; - var40 = var36.method290(var0, var2, var3); - if (var40 != 0L) { - var30 = class50.getObjectDefinition(HitSplatDefinition.method4972(var40)).int2; - } - - if (var38.animationId == -1 && var38.transforms == null) { - var31 = var38.getModel(4, var5, var22, var24, var23, var25); - } else { - var31 = new DynamicObject(var4, 4, var5, var12, var2, var3, var38.animationId, true, (Entity)null); - } - - var36.newWallDecoration(var0, var2, var3, var23, (Entity)var31, (Entity)null, Tiles.field911[var5], 0, var30 * Tiles.field913[var5], var30 * Tiles.field914[var5], var26, var28); - } else if (var6 == 6) { - var30 = 8; - var40 = var36.method290(var0, var2, var3); - if (var40 != 0L) { - var30 = class50.getObjectDefinition(HitSplatDefinition.method4972(var40)).int2 / 2; - } - - if (var38.animationId == -1 && var38.transforms == null) { - var31 = var38.getModel(4, var5 + 4, var22, var24, var23, var25); - } else { - var31 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var38.animationId, true, (Entity)null); - } - - var36.newWallDecoration(var0, var2, var3, var23, (Entity)var31, (Entity)null, 256, var5, var30 * Tiles.field915[var5], var30 * Tiles.field916[var5], var26, var28); - } else { - int var34; - if (var6 == 7) { - var34 = var5 + 2 & 3; - if (var38.animationId == -1 && var38.transforms == null) { - var29 = var38.getModel(4, var34 + 4, var22, var24, var23, var25); - } else { - var29 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var38.animationId, true, (Entity)null); - } - - var36.newWallDecoration(var0, var2, var3, var23, (Entity)var29, (Entity)null, 256, var34, 0, 0, var26, var28); - } else if (var6 == 8) { - var30 = 8; - var40 = var36.method290(var0, var2, var3); - if (var40 != 0L) { - var30 = class50.getObjectDefinition(HitSplatDefinition.method4972(var40)).int2 / 2; - } - - var34 = var5 + 2 & 3; - Object var35; - if (var38.animationId == -1 && var38.transforms == null) { - var31 = var38.getModel(4, var5 + 4, var22, var24, var23, var25); - var35 = var38.getModel(4, var34 + 4, var22, var24, var23, var25); - } else { - var31 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var38.animationId, true, (Entity)null); - var35 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var38.animationId, true, (Entity)null); - } - - var36.newWallDecoration(var0, var2, var3, var23, (Entity)var31, (Entity)var35, 256, var5, var30 * Tiles.field915[var5], var30 * Tiles.field916[var5], var26, var28); - } - } - } - } - } else { - if (var38.animationId == -1 && var38.transforms == null) { - var29 = var38.getModel(10, var5, var22, var24, var23, var25); - } else { - var29 = new DynamicObject(var4, 10, var5, var12, var2, var3, var38.animationId, true, (Entity)null); - } - - if (var29 != null) { - var36.method284(var0, var2, var3, var23, var39, var17, (Entity)var29, var6 == 11 ? 256 : 0, var26, var28); - } - - if (var38.interactType != 0) { - var37.method91(var2, var3, var39, var17, var38.boolean1); - } - } - } - } - - } - - static { - ParamKeyDefinition_cached = new EvictingDualNodeHashTable(64); - } -} diff --git a/runescape-client/src/main/java/PcmPlayer.java b/runescape-client/src/main/java/PcmPlayer.java index 3645cf21ef..ef333e2f0f 100644 --- a/runescape-client/src/main/java/PcmPlayer.java +++ b/runescape-client/src/main/java/PcmPlayer.java @@ -17,8 +17,8 @@ public class PcmPlayer { @ObfuscatedSignature( signature = "Ldc;" ) - @Export("stream0") - PcmStream stream0; + @Export("stream") + PcmStream stream; @ObfuscatedName("z") @ObfuscatedGetter( intValue = 1125788887 @@ -121,7 +121,7 @@ public class PcmPlayer { garbageValue = "-1738349775" ) @Export("open") - protected void open(int var1) throws Exception { + protected void open(int bufferSize) throws Exception { } @ObfuscatedName("q") @@ -163,8 +163,8 @@ public class PcmPlayer { garbageValue = "2106357590" ) @Export("setStream") - public final synchronized void setStream(PcmStream var1) { - this.stream0 = var1; + public final synchronized void setStream(PcmStream stream) { + this.stream = stream; } @ObfuscatedName("ar") @@ -324,32 +324,32 @@ public class PcmPlayer { garbageValue = "-424358259" ) @Export("skip") - final void skip(int var1) { - this.field686 -= var1; + final void skip(int length) { + this.field686 -= length; if (this.field686 < 0) { this.field686 = 0; } - if (this.stream0 != null) { - this.stream0.vmethod264(var1); + if (this.stream != null) { + this.stream.skip(length); } } @ObfuscatedName("aw") @Export("fill") - final void fill(int[] var1, int var2) { - int var3 = var2; + final void fill(int[] buffer, int length) { + int var3 = length; if (isStereo) { - var3 = var2 << 1; + var3 = length << 1; } - class212.clearIntArray(var1, 0, var3); - this.field686 -= var2; - if (this.stream0 != null && this.field686 <= 0) { + class212.clearIntArray(buffer, 0, var3); + this.field686 -= length; + if (this.stream != null && this.field686 <= 0) { this.field686 += class309.PcmPlayer_sampleRate >> 4; - MidiPcmStream.PcmStream_disable(this.stream0); - this.method243(this.stream0, this.stream0.vmethod282()); + MidiPcmStream.PcmStream_disable(this.stream); + this.method243(this.stream, this.stream.vmethod282()); int var4 = 0; int var5 = 255; @@ -443,8 +443,8 @@ public class PcmPlayer { this.field686 = 0; } - if (this.stream0 != null) { - this.stream0.vmethod263(var1, 0, var2); + if (this.stream != null) { + this.stream.fill(buffer, 0, length); } this.timeMs = class203.currentTimeMs(); diff --git a/runescape-client/src/main/java/PcmStream.java b/runescape-client/src/main/java/PcmStream.java index de4c6a3fc7..b7e6a9af70 100644 --- a/runescape-client/src/main/java/PcmStream.java +++ b/runescape-client/src/main/java/PcmStream.java @@ -46,10 +46,12 @@ public abstract class PcmStream extends Node { protected abstract int vmethod262(); @ObfuscatedName("e") - protected abstract void vmethod263(int[] var1, int var2, int var3); + @Export("fill") + protected abstract void fill(int[] buffer, int start, int end); @ObfuscatedName("d") - protected abstract void vmethod264(int var1); + @Export("skip") + protected abstract void skip(int length); @ObfuscatedName("az") int vmethod282() { @@ -58,11 +60,11 @@ public abstract class PcmStream extends Node { @ObfuscatedName("ef") @Export("update") - final void update(int[] var1, int var2, int var3) { + final void update(int[] buffer, int start, int end) { if (this.active) { - this.vmethod263(var1, var2, var3); + this.fill(buffer, start, end); } else { - this.vmethod264(var3); + this.skip(end); } } diff --git a/runescape-client/src/main/java/PcmStreamMixer.java b/runescape-client/src/main/java/PcmStreamMixer.java index 485333b5f2..95c0469546 100644 --- a/runescape-client/src/main/java/PcmStreamMixer.java +++ b/runescape-client/src/main/java/PcmStreamMixer.java @@ -34,8 +34,8 @@ public class PcmStreamMixer extends PcmStream { signature = "(Ldc;)V" ) @Export("addSubStream") - public final synchronized void addSubStream(PcmStream var1) { - this.subStreams.addLast(var1); + public final synchronized void addSubStream(PcmStream subStream) { + this.subStreams.addLast(subStream); } @ObfuscatedName("f") @@ -43,8 +43,8 @@ public class PcmStreamMixer extends PcmStream { signature = "(Ldc;)V" ) @Export("removeSubStream") - public final synchronized void removeSubStream(PcmStream var1) { - var1.remove(); + public final synchronized void removeSubStream(PcmStream subStream) { + subStream.remove(); } @ObfuscatedName("q") @@ -113,7 +113,8 @@ public class PcmStreamMixer extends PcmStream { } @ObfuscatedName("e") - public final synchronized void vmethod263(int[] var1, int var2, int var3) { + @Export("fill") + public final synchronized void fill(int[] var1, int var2, int var3) { do { if (this.field692 < 0) { this.updateSubStreams(var1, var2, var3); @@ -149,15 +150,16 @@ public class PcmStreamMixer extends PcmStream { @ObfuscatedName("x") @Export("updateSubStreams") - void updateSubStreams(int[] var1, int var2, int var3) { + void updateSubStreams(int[] buffer, int start, int end) { for (PcmStream var4 = (PcmStream)this.subStreams.last(); var4 != null; var4 = (PcmStream)this.subStreams.previous()) { - var4.update(var1, var2, var3); + var4.update(buffer, start, end); } } @ObfuscatedName("d") - public final synchronized void vmethod264(int var1) { + @Export("skip") + public final synchronized void skip(int var1) { do { if (this.field692 < 0) { this.skipSubStreams(var1); @@ -192,9 +194,9 @@ public class PcmStreamMixer extends PcmStream { @ObfuscatedName("a") @Export("skipSubStreams") - void skipSubStreams(int var1) { + void skipSubStreams(int length) { for (PcmStream var2 = (PcmStream)this.subStreams.last(); var2 != null; var2 = (PcmStream)this.subStreams.previous()) { - var2.vmethod264(var1); + var2.skip(length); } } diff --git a/runescape-client/src/main/java/PendingSpawn.java b/runescape-client/src/main/java/PendingSpawn.java index 8e4e90b17d..c3b1a86330 100644 --- a/runescape-client/src/main/java/PendingSpawn.java +++ b/runescape-client/src/main/java/PendingSpawn.java @@ -11,8 +11,8 @@ public final class PendingSpawn extends Node { @ObfuscatedGetter( intValue = 1439936951 ) - @Export("level") - int level; + @Export("plane") + int plane; @ObfuscatedName("f") @ObfuscatedGetter( intValue = -1471611383 @@ -97,9 +97,9 @@ public final class PendingSpawn extends Node { ) public static void method1695(int var0, int var1) { VarbitDefinition var2 = Occluder.method3255(var0); - int var3 = var2.varp; - int var4 = var2.lowBit; - int var5 = var2.highBit; + int var3 = var2.baseVar; + int var4 = var2.startBit; + int var5 = var2.endBit; int var6 = Varps.Varps_masks[var5 - var4]; if (var1 < 0 || var1 > var6) { var1 = 0; diff --git a/runescape-client/src/main/java/PlatformInfo.java b/runescape-client/src/main/java/PlatformInfo.java index 674c083ee3..d3cd3d6756 100644 --- a/runescape-client/src/main/java/PlatformInfo.java +++ b/runescape-client/src/main/java/PlatformInfo.java @@ -138,37 +138,37 @@ public class PlatformInfo extends Node { garbageValue = "1518809220" ) @Export("write") - public void write(Buffer var1) { - var1.writeByte(7); - var1.writeByte(this.field694); - var1.writeByte(this.field695 ? 1 : 0); - var1.writeByte(this.field696); - var1.writeByte(this.field697); - var1.writeByte(this.field698); - var1.writeByte(this.field699); - var1.writeByte(this.field700); - var1.writeByte(this.field701 ? 1 : 0); - var1.writeShort(this.field702); - var1.writeByte(this.field703); - var1.writeMedium(this.field704); - var1.writeShort(this.field705); - var1.writeStringCp1252NullCircumfixed(this.field706); - var1.writeStringCp1252NullCircumfixed(this.field707); - var1.writeStringCp1252NullCircumfixed(this.field708); - var1.writeStringCp1252NullCircumfixed(this.field709); - var1.writeByte(this.field711); - var1.writeShort(this.field710); - var1.writeStringCp1252NullCircumfixed(this.field714); - var1.writeStringCp1252NullCircumfixed(this.field715); - var1.writeByte(this.field712); - var1.writeByte(this.field713); + public void write(Buffer buffer) { + buffer.writeByte(7); + buffer.writeByte(this.field694); + buffer.writeByte(this.field695 ? 1 : 0); + buffer.writeByte(this.field696); + buffer.writeByte(this.field697); + buffer.writeByte(this.field698); + buffer.writeByte(this.field699); + buffer.writeByte(this.field700); + buffer.writeByte(this.field701 ? 1 : 0); + buffer.writeShort(this.field702); + buffer.writeByte(this.field703); + buffer.writeMedium(this.field704); + buffer.writeShort(this.field705); + buffer.writeStringCp1252NullCircumfixed(this.field706); + buffer.writeStringCp1252NullCircumfixed(this.field707); + buffer.writeStringCp1252NullCircumfixed(this.field708); + buffer.writeStringCp1252NullCircumfixed(this.field709); + buffer.writeByte(this.field711); + buffer.writeShort(this.field710); + buffer.writeStringCp1252NullCircumfixed(this.field714); + buffer.writeStringCp1252NullCircumfixed(this.field715); + buffer.writeByte(this.field712); + buffer.writeByte(this.field713); for (int var2 = 0; var2 < this.field716.length; ++var2) { - var1.writeInt(this.field716[var2]); + buffer.writeInt(this.field716[var2]); } - var1.writeInt(this.field717); - var1.writeStringCp1252NullCircumfixed(this.field718); + buffer.writeInt(this.field717); + buffer.writeStringCp1252NullCircumfixed(this.field718); } @ObfuscatedName("f") diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java index 2845a48a04..5f6f9ad2de 100644 --- a/runescape-client/src/main/java/Player.java +++ b/runescape-client/src/main/java/Player.java @@ -190,11 +190,11 @@ public final class Player extends Actor { garbageValue = "-801926003" ) @Export("read") - final void read(Buffer var1) { - var1.index = 0; - int var2 = var1.readUnsignedByte(); - this.headIconPk = var1.readByte(); - this.headIconPrayer = var1.readByte(); + final void read(Buffer buffer) { + buffer.index = 0; + int var2 = buffer.readUnsignedByte(); + this.headIconPk = buffer.readByte(); + this.headIconPrayer = buffer.readByte(); int var3 = -1; this.team = 0; int[] var4 = new int[12]; @@ -202,19 +202,19 @@ public final class Player extends Actor { int var5; int var6; for (int var7 = 0; var7 < 12; ++var7) { - var5 = var1.readUnsignedByte(); + var5 = buffer.readUnsignedByte(); if (var5 == 0) { var4[var7] = 0; } else { - var6 = var1.readUnsignedByte(); + var6 = buffer.readUnsignedByte(); var4[var7] = var6 + (var5 << 8); if (var7 == 0 && var4[0] == 65535) { - var3 = var1.readUnsignedShort(); + var3 = buffer.readUnsignedShort(); break; } if (var4[var7] >= 512) { - int var8 = Skills.getItemDefinition(var4[var7] - 512).int1; + int var8 = Skills.getItemDefinition(var4[var7] - 512).team; if (var8 != 0) { this.team = var8; } @@ -225,7 +225,7 @@ public final class Player extends Actor { int[] var9 = new int[5]; for (var5 = 0; var5 < 5; ++var5) { - var6 = var1.readUnsignedByte(); + var6 = buffer.readUnsignedByte(); if (var6 < 0 || var6 >= class229.field1137[var5].length) { var6 = 0; } @@ -233,53 +233,53 @@ public final class Player extends Actor { var9[var5] = var6; } - super.idleSequence = var1.readUnsignedShort(); - if (super.idleSequence == 65535) { - super.idleSequence = -1; + super.readySequence = buffer.readUnsignedShort(); + if (super.readySequence == 65535) { + super.readySequence = -1; } - super.turnLeftSequence = var1.readUnsignedShort(); + super.turnLeftSequence = buffer.readUnsignedShort(); if (super.turnLeftSequence == 65535) { super.turnLeftSequence = -1; } super.turnRightSequence = super.turnLeftSequence; - super.walkSequence = var1.readUnsignedShort(); + super.walkSequence = buffer.readUnsignedShort(); if (super.walkSequence == 65535) { super.walkSequence = -1; } - super.walkTurnSequence = var1.readUnsignedShort(); - if (super.walkTurnSequence == 65535) { - super.walkTurnSequence = -1; + super.walkBackSequence = buffer.readUnsignedShort(); + if (super.walkBackSequence == 65535) { + super.walkBackSequence = -1; } - super.walkTurnLeftSequence = var1.readUnsignedShort(); - if (super.walkTurnLeftSequence == 65535) { - super.walkTurnLeftSequence = -1; + super.walkLeftSequence = buffer.readUnsignedShort(); + if (super.walkLeftSequence == 65535) { + super.walkLeftSequence = -1; } - super.walkTurnRightSequence = var1.readUnsignedShort(); - if (super.walkTurnRightSequence == 65535) { - super.walkTurnRightSequence = -1; + super.walkRightSequence = buffer.readUnsignedShort(); + if (super.walkRightSequence == 65535) { + super.walkRightSequence = -1; } - super.runSequence = var1.readUnsignedShort(); + super.runSequence = buffer.readUnsignedShort(); if (super.runSequence == 65535) { super.runSequence = -1; } - this.username = new Username(var1.readStringCp1252NullTerminated(), KeyHandler.loginType); + this.username = new Username(buffer.readStringCp1252NullTerminated(), KeyHandler.loginType); this.clearIsFriend(); this.clearIsInClanChat(); if (this == Canvas.localPlayer) { RunException.localPlayerName = this.username.getName(); } - this.combatLevel = var1.readUnsignedByte(); - this.skillLevel = var1.readUnsignedShort(); - this.isHidden = var1.readUnsignedByte() == 1; - if (Client.gameBuild == 0 && Client.rights >= 2) { + this.combatLevel = buffer.readUnsignedByte(); + this.skillLevel = buffer.readUnsignedShort(); + this.isHidden = buffer.readUnsignedByte() == 1; + if (Client.gameBuild == 0 && Client.staffModLevel >= 2) { this.isHidden = false; } @@ -379,7 +379,7 @@ public final class Player extends Actor { return null; } else { SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? WorldMapAreaData.getSequenceDefinition(super.sequence) : null; - SequenceDefinition var2 = super.movementSequence != -1 && !this.isUnanimated && (super.idleSequence != super.movementSequence || var1 == null) ? WorldMapAreaData.getSequenceDefinition(super.movementSequence) : null; + SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.readySequence == super.movementSequence && var1 != null ? null : WorldMapAreaData.getSequenceDefinition(super.movementSequence); Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); if (var3 == null) { return null; @@ -472,12 +472,12 @@ public final class Player extends Actor { garbageValue = "1966552419" ) @Export("resetPath") - void resetPath(int var1, int var2) { + void resetPath(int x, int y) { super.pathLength = 0; super.field25 = 0; super.field24 = 0; - super.pathX[0] = var1; - super.pathY[0] = var2; + super.pathX[0] = x; + super.pathY[0] = y; int var3 = this.transformedSize(); super.x = super.pathX[0] * 128 + var3 * 64; super.y = super.pathY[0] * 128 + var3 * 64; @@ -526,7 +526,7 @@ public final class Player extends Actor { ScriptEvent var1 = new ScriptEvent(); var1.widget = var0; var1.args0 = var0.onTargetLeave; - AbstractIndexCache.runScript(var1); + AbstractArchive.runScript(var1); } Client.isSpellSelected = false; diff --git a/runescape-client/src/main/java/PlayerAppearance.java b/runescape-client/src/main/java/PlayerAppearance.java index 59bb5ca93b..46059675b7 100644 --- a/runescape-client/src/main/java/PlayerAppearance.java +++ b/runescape-client/src/main/java/PlayerAppearance.java @@ -303,8 +303,8 @@ public class PlayerAppearance { var18.recolor(field726[var12], class229.field1137[var12][this.bodyColors[var12]]); } - if (this.bodyColors[var12] < IndexCacheLoader.field406[var12].length) { - var18.recolor(class227.field1136[var12], IndexCacheLoader.field406[var12][this.bodyColors[var12]]); + if (this.bodyColors[var12] < ArchiveLoader.field406[var12].length) { + var18.recolor(class227.field1136[var12], ArchiveLoader.field406[var12][this.bodyColors[var12]]); } } @@ -387,8 +387,8 @@ public class PlayerAppearance { var8.recolor(field726[var4], class229.field1137[var4][this.bodyColors[var4]]); } - if (this.bodyColors[var4] < IndexCacheLoader.field406[var4].length) { - var8.recolor(class227.field1136[var4], IndexCacheLoader.field406[var4][this.bodyColors[var4]]); + if (this.bodyColors[var4] < ArchiveLoader.field406[var4].length) { + var8.recolor(class227.field1136[var4], ArchiveLoader.field406[var4][this.bodyColors[var4]]); } } diff --git a/runescape-client/src/main/java/Players.java b/runescape-client/src/main/java/Players.java index 8ce53385e0..031248e6ca 100644 --- a/runescape-client/src/main/java/Players.java +++ b/runescape-client/src/main/java/Players.java @@ -144,22 +144,22 @@ public class Players { garbageValue = "-1991202495" ) @Export("clickWidget") - static final void clickWidget(Widget var0, int var1, int var2) { - if (Client.clickedWidget == null && !Client.isMenuOpen && var0 != null && class48.method869(var0) != null) { - Client.clickedWidget = var0; - Client.clickedWidgetParent = class48.method869(var0); - Client.widgetClickX = var1; - Client.widgetClickY = var2; + static final void clickWidget(Widget component, int x, int y) { + if (Client.clickedWidget == null && !Client.isMenuOpen && component != null && class48.method869(component) != null) { + Client.clickedWidget = component; + Client.clickedWidgetParent = class48.method869(component); + Client.widgetClickX = x; + Client.widgetClickY = y; MouseRecorder.widgetDragDuration = 0; Client.isDraggingWidget = false; int var3 = Client.menuOptionsCount - 1; if (var3 != -1) { - UnitPriceComparator.tempMenuAction = new MenuAction(); - UnitPriceComparator.tempMenuAction.argument1 = Client.menuArguments1[var3]; - UnitPriceComparator.tempMenuAction.argument2 = Client.menuArguments2[var3]; - UnitPriceComparator.tempMenuAction.opcode = Client.menuOpcodes[var3]; - UnitPriceComparator.tempMenuAction.argument0 = Client.menuArguments0[var3]; - UnitPriceComparator.tempMenuAction.action = Client.menuActions[var3]; + GrandExchangeOfferUnitPriceComparator.tempMenuAction = new MenuAction(); + GrandExchangeOfferUnitPriceComparator.tempMenuAction.argument1 = Client.menuArguments1[var3]; + GrandExchangeOfferUnitPriceComparator.tempMenuAction.argument2 = Client.menuArguments2[var3]; + GrandExchangeOfferUnitPriceComparator.tempMenuAction.opcode = Client.menuOpcodes[var3]; + GrandExchangeOfferUnitPriceComparator.tempMenuAction.argument0 = Client.menuArguments0[var3]; + GrandExchangeOfferUnitPriceComparator.tempMenuAction.action = Client.menuActions[var3]; } } diff --git a/runescape-client/src/main/java/Projectile.java b/runescape-client/src/main/java/Projectile.java index f1c3efecb7..1712df6d1e 100644 --- a/runescape-client/src/main/java/Projectile.java +++ b/runescape-client/src/main/java/Projectile.java @@ -168,26 +168,26 @@ public final class Projectile extends Entity { garbageValue = "-553495769" ) @Export("setDestination") - final void setDestination(int var1, int var2, int var3, int var4) { + final void setDestination(int x, int y, int height, int cycle) { double var5; if (!this.isMoving) { - var5 = (double)(var1 - this.sourceX); - double var7 = (double)(var2 - this.sourceY); + var5 = (double)(x - this.sourceX); + double var7 = (double)(y - this.sourceY); double var9 = Math.sqrt(var5 * var5 + var7 * var7); this.x = (double)this.sourceX + var5 * (double)this.startHeight / var9; this.y = (double)this.sourceY + (double)this.startHeight * var7 / var9; this.z = (double)this.sourceZ; } - var5 = (double)(this.cycleEnd + 1 - var4); - this.speedX = ((double)var1 - this.x) / var5; - this.speedY = ((double)var2 - this.y) / var5; + var5 = (double)(this.cycleEnd + 1 - cycle); + this.speedX = ((double)x - this.x) / var5; + this.speedY = ((double)y - this.y) / var5; this.speed = Math.sqrt(this.speedY * this.speedY + this.speedX * this.speedX); if (!this.isMoving) { this.speedZ = -this.speed * Math.tan(0.02454369D * (double)this.slope); } - this.accelerationZ = ((double)var3 - this.z - var5 * this.speedZ) * 2.0D / (var5 * var5); + this.accelerationZ = ((double)height - this.z - var5 * this.speedZ) * 2.0D / (var5 * var5); } @ObfuscatedName("f") @@ -196,16 +196,16 @@ public final class Projectile extends Entity { garbageValue = "1351865817" ) @Export("advance") - final void advance(int var1) { + final void advance(int cycles) { this.isMoving = true; - this.x += this.speedX * (double)var1; - this.y += (double)var1 * this.speedY; - this.z += (double)var1 * this.accelerationZ * 0.5D * (double)var1 + this.speedZ * (double)var1; - this.speedZ += this.accelerationZ * (double)var1; + this.x += this.speedX * (double)cycles; + this.y += (double)cycles * this.speedY; + this.z += (double)cycles * this.accelerationZ * 0.5D * (double)cycles + this.speedZ * (double)cycles; + this.speedZ += this.accelerationZ * (double)cycles; this.yaw = (int)(Math.atan2(this.speedX, this.speedY) * 325.949D) + 1024 & 2047; this.pitch = (int)(Math.atan2(this.speedZ, this.speed) * 325.949D) & 2047; if (this.sequenceDefinition != null) { - this.frameCycle += var1; + this.frameCycle += cycles; while (true) { do { @@ -249,21 +249,21 @@ public final class Projectile extends Entity { garbageValue = "95" ) @Export("byteArrayToObject") - public static Object byteArrayToObject(byte[] var0, boolean var1) { - if (var0 == null) { + public static Object byteArrayToObject(byte[] bytes, boolean copyArray) { + if (bytes == null) { return null; } else { - if (var0.length > 136 && !AbstractByteArrayCopier.directBufferUnavailable) { + if (bytes.length > 136 && !AbstractByteArrayCopier.directBufferUnavailable) { try { DirectByteArrayCopier var2 = new DirectByteArrayCopier(); - var2.set(var0); + var2.set(bytes); return var2; } catch (Throwable var3) { AbstractByteArrayCopier.directBufferUnavailable = true; } } - return var0; + return bytes; } } diff --git a/runescape-client/src/main/java/RasterProvider.java b/runescape-client/src/main/java/RasterProvider.java index 1de95514a1..af00547fa4 100644 --- a/runescape-client/src/main/java/RasterProvider.java +++ b/runescape-client/src/main/java/RasterProvider.java @@ -52,8 +52,8 @@ public final class RasterProvider extends AbstractRasterProvider { garbageValue = "-430495007" ) @Export("drawFull") - public final void drawFull(int var1, int var2) { - this.drawFull0(this.component0.getGraphics(), var1, var2); + public final void drawFull(int x, int y) { + this.drawFull0(this.component0.getGraphics(), x, y); } @ObfuscatedName("q") @@ -62,8 +62,8 @@ public final class RasterProvider extends AbstractRasterProvider { garbageValue = "18" ) @Export("draw") - public final void draw(int var1, int var2, int var3, int var4) { - this.draw0(this.component0.getGraphics(), var1, var2, var3, var4); + public final void draw(int x, int y, int width, int height) { + this.draw0(this.component0.getGraphics(), x, y, width, height); } @ObfuscatedName("w") @@ -72,9 +72,9 @@ public final class RasterProvider extends AbstractRasterProvider { garbageValue = "-2102440865" ) @Export("drawFull0") - final void drawFull0(Graphics var1, int var2, int var3) { + final void drawFull0(Graphics graphics, int x, int y) { try { - var1.drawImage(this.image, var2, var3, this.component0); + graphics.drawImage(this.image, x, y, this.component0); } catch (Exception var5) { this.component0.repaint(); } @@ -87,12 +87,12 @@ public final class RasterProvider extends AbstractRasterProvider { garbageValue = "3" ) @Export("draw0") - final void draw0(Graphics var1, int var2, int var3, int var4, int var5) { + final void draw0(Graphics graphics, int x, int y, int width, int height) { try { - Shape var6 = var1.getClip(); - var1.clipRect(var2, var3, var4, var5); - var1.drawImage(this.image, 0, 0, this.component0); - var1.setClip(var6); + Shape var6 = graphics.getClip(); + graphics.clipRect(x, y, width, height); + graphics.drawImage(this.image, 0, 0, this.component0); + graphics.setClip(var6); } catch (Exception var7) { this.component0.repaint(); } diff --git a/runescape-client/src/main/java/Rasterizer2D.java b/runescape-client/src/main/java/Rasterizer2D.java index fa866cd41a..a25f8df18a 100644 --- a/runescape-client/src/main/java/Rasterizer2D.java +++ b/runescape-client/src/main/java/Rasterizer2D.java @@ -30,11 +30,11 @@ public class Rasterizer2D extends DualNode { @ObfuscatedName("dp") @Export("Rasterizer2D_replace") - public static void Rasterizer2D_replace(int[] var0, int var1, int var2) { - Rasterizer2D_pixels = var0; - Rasterizer2D_width = var1; - Rasterizer2D_height = var2; - Rasterizer2D_setClip(0, 0, var1, var2); + public static void Rasterizer2D_replace(int[] pixels, int width, int height) { + Rasterizer2D_pixels = pixels; + Rasterizer2D_width = width; + Rasterizer2D_height = height; + Rasterizer2D_setClip(0, 0, width, height); } @ObfuscatedName("ds") @@ -48,66 +48,66 @@ public class Rasterizer2D extends DualNode { @ObfuscatedName("di") @Export("Rasterizer2D_setClip") - public static void Rasterizer2D_setClip(int var0, int var1, int var2, int var3) { - if (var0 < 0) { - var0 = 0; + public static void Rasterizer2D_setClip(int xStart, int yStart, int xEnd, int yEnd) { + if (xStart < 0) { + xStart = 0; } - if (var1 < 0) { - var1 = 0; + if (yStart < 0) { + yStart = 0; } - if (var2 > Rasterizer2D_width) { - var2 = Rasterizer2D_width; + if (xEnd > Rasterizer2D_width) { + xEnd = Rasterizer2D_width; } - if (var3 > Rasterizer2D_height) { - var3 = Rasterizer2D_height; + if (yEnd > Rasterizer2D_height) { + yEnd = Rasterizer2D_height; } - Rasterizer2D_xClipStart = var0; - Rasterizer2D_yClipStart = var1; - Rasterizer2D_xClipEnd = var2; - Rasterizer2D_yClipEnd = var3; + Rasterizer2D_xClipStart = xStart; + Rasterizer2D_yClipStart = yStart; + Rasterizer2D_xClipEnd = xEnd; + Rasterizer2D_yClipEnd = yEnd; } @ObfuscatedName("dc") @Export("Rasterizer2D_expandClip") - public static void Rasterizer2D_expandClip(int var0, int var1, int var2, int var3) { - if (Rasterizer2D_xClipStart < var0) { - Rasterizer2D_xClipStart = var0; + public static void Rasterizer2D_expandClip(int xStart, int yStart, int xEnd, int yEnd) { + if (Rasterizer2D_xClipStart < xStart) { + Rasterizer2D_xClipStart = xStart; } - if (Rasterizer2D_yClipStart < var1) { - Rasterizer2D_yClipStart = var1; + if (Rasterizer2D_yClipStart < yStart) { + Rasterizer2D_yClipStart = yStart; } - if (Rasterizer2D_xClipEnd > var2) { - Rasterizer2D_xClipEnd = var2; + if (Rasterizer2D_xClipEnd > xEnd) { + Rasterizer2D_xClipEnd = xEnd; } - if (Rasterizer2D_yClipEnd > var3) { - Rasterizer2D_yClipEnd = var3; + if (Rasterizer2D_yClipEnd > yEnd) { + Rasterizer2D_yClipEnd = yEnd; } } @ObfuscatedName("dg") @Export("Rasterizer2D_getClipArray") - public static void Rasterizer2D_getClipArray(int[] var0) { - var0[0] = Rasterizer2D_xClipStart; - var0[1] = Rasterizer2D_yClipStart; - var0[2] = Rasterizer2D_xClipEnd; - var0[3] = Rasterizer2D_yClipEnd; + public static void Rasterizer2D_getClipArray(int[] dst) { + dst[0] = Rasterizer2D_xClipStart; + dst[1] = Rasterizer2D_yClipStart; + dst[2] = Rasterizer2D_xClipEnd; + dst[3] = Rasterizer2D_yClipEnd; } @ObfuscatedName("db") @Export("Rasterizer2D_setClipArray") - public static void Rasterizer2D_setClipArray(int[] var0) { - Rasterizer2D_xClipStart = var0[0]; - Rasterizer2D_yClipStart = var0[1]; - Rasterizer2D_xClipEnd = var0[2]; - Rasterizer2D_yClipEnd = var0[3]; + public static void Rasterizer2D_setClipArray(int[] src) { + Rasterizer2D_xClipStart = src[0]; + Rasterizer2D_yClipStart = src[1]; + Rasterizer2D_xClipEnd = src[2]; + Rasterizer2D_yClipEnd = src[3]; } @ObfuscatedName("dd") @@ -379,31 +379,31 @@ public class Rasterizer2D extends DualNode { @ObfuscatedName("dr") @Export("Rasterizer2D_fillRectangle") - public static void Rasterizer2D_fillRectangle(int var0, int var1, int var2, int var3, int var4) { - if (var0 < Rasterizer2D_xClipStart) { - var2 -= Rasterizer2D_xClipStart - var0; - var0 = Rasterizer2D_xClipStart; + public static void Rasterizer2D_fillRectangle(int x, int y, int width, int height, int color) { + if (x < Rasterizer2D_xClipStart) { + width -= Rasterizer2D_xClipStart - x; + x = Rasterizer2D_xClipStart; } - if (var1 < Rasterizer2D_yClipStart) { - var3 -= Rasterizer2D_yClipStart - var1; - var1 = Rasterizer2D_yClipStart; + if (y < Rasterizer2D_yClipStart) { + height -= Rasterizer2D_yClipStart - y; + y = Rasterizer2D_yClipStart; } - if (var0 + var2 > Rasterizer2D_xClipEnd) { - var2 = Rasterizer2D_xClipEnd - var0; + if (x + width > Rasterizer2D_xClipEnd) { + width = Rasterizer2D_xClipEnd - x; } - if (var3 + var1 > Rasterizer2D_yClipEnd) { - var3 = Rasterizer2D_yClipEnd - var1; + if (height + y > Rasterizer2D_yClipEnd) { + height = Rasterizer2D_yClipEnd - y; } - int var5 = Rasterizer2D_width - var2; - int var6 = var0 + Rasterizer2D_width * var1; + int var5 = Rasterizer2D_width - width; + int var6 = x + Rasterizer2D_width * y; - for (int var7 = -var3; var7 < 0; ++var7) { - for (int var8 = -var2; var8 < 0; ++var8) { - Rasterizer2D_pixels[var6++] = var4; + for (int var7 = -height; var7 < 0; ++var7) { + for (int var8 = -width; var8 < 0; ++var8) { + Rasterizer2D_pixels[var6++] = color; } var6 += var5; @@ -594,42 +594,42 @@ public class Rasterizer2D extends DualNode { @ObfuscatedName("dh") @Export("Rasterizer2D_drawRectangle") - public static void Rasterizer2D_drawRectangle(int var0, int var1, int var2, int var3, int var4) { - Rasterizer2D_drawHorizontalLine(var0, var1, var2, var4); - Rasterizer2D_drawHorizontalLine(var0, var3 + var1 - 1, var2, var4); - Rasterizer2D_drawVerticalLine(var0, var1, var3, var4); - Rasterizer2D_drawVerticalLine(var0 + var2 - 1, var1, var3, var4); + public static void Rasterizer2D_drawRectangle(int x, int y, int width, int height, int color) { + Rasterizer2D_drawHorizontalLine(x, y, width, color); + Rasterizer2D_drawHorizontalLine(x, height + y - 1, width, color); + Rasterizer2D_drawVerticalLine(x, y, height, color); + Rasterizer2D_drawVerticalLine(x + width - 1, y, height, color); } @ObfuscatedName("dz") @Export("Rasterizer2D_drawRectangleAlpha") - public static void Rasterizer2D_drawRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { - Rasterizer2D_drawHorizontalLineAlpha(var0, var1, var2, var4, var5); - Rasterizer2D_drawHorizontalLineAlpha(var0, var3 + var1 - 1, var2, var4, var5); - if (var3 >= 3) { - Rasterizer2D_drawVerticalLineAlpha(var0, var1 + 1, var3 - 2, var4, var5); - Rasterizer2D_drawVerticalLineAlpha(var0 + var2 - 1, var1 + 1, var3 - 2, var4, var5); + public static void Rasterizer2D_drawRectangleAlpha(int x, int y, int width, int height, int rgb, int alpha) { + Rasterizer2D_drawHorizontalLineAlpha(x, y, width, rgb, alpha); + Rasterizer2D_drawHorizontalLineAlpha(x, height + y - 1, width, rgb, alpha); + if (height >= 3) { + Rasterizer2D_drawVerticalLineAlpha(x, y + 1, height - 2, rgb, alpha); + Rasterizer2D_drawVerticalLineAlpha(x + width - 1, y + 1, height - 2, rgb, alpha); } } @ObfuscatedName("dj") @Export("Rasterizer2D_drawHorizontalLine") - public static void Rasterizer2D_drawHorizontalLine(int var0, int var1, int var2, int var3) { - if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { - if (var0 < Rasterizer2D_xClipStart) { - var2 -= Rasterizer2D_xClipStart - var0; - var0 = Rasterizer2D_xClipStart; + public static void Rasterizer2D_drawHorizontalLine(int x, int y, int length, int color) { + if (y >= Rasterizer2D_yClipStart && y < Rasterizer2D_yClipEnd) { + if (x < Rasterizer2D_xClipStart) { + length -= Rasterizer2D_xClipStart - x; + x = Rasterizer2D_xClipStart; } - if (var0 + var2 > Rasterizer2D_xClipEnd) { - var2 = Rasterizer2D_xClipEnd - var0; + if (x + length > Rasterizer2D_xClipEnd) { + length = Rasterizer2D_xClipEnd - x; } - int var4 = var0 + Rasterizer2D_width * var1; + int var4 = x + Rasterizer2D_width * y; - for (int var5 = 0; var5 < var2; ++var5) { - Rasterizer2D_pixels[var4 + var5] = var3; + for (int var5 = 0; var5 < length; ++var5) { + Rasterizer2D_pixels[var4 + var5] = color; } } @@ -637,24 +637,24 @@ public class Rasterizer2D extends DualNode { @ObfuscatedName("du") @Export("Rasterizer2D_drawHorizontalLineAlpha") - static void Rasterizer2D_drawHorizontalLineAlpha(int var0, int var1, int var2, int var3, int var4) { - if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { - if (var0 < Rasterizer2D_xClipStart) { - var2 -= Rasterizer2D_xClipStart - var0; - var0 = Rasterizer2D_xClipStart; + static void Rasterizer2D_drawHorizontalLineAlpha(int x, int y, int length, int rgb, int alpha) { + if (y >= Rasterizer2D_yClipStart && y < Rasterizer2D_yClipEnd) { + if (x < Rasterizer2D_xClipStart) { + length -= Rasterizer2D_xClipStart - x; + x = Rasterizer2D_xClipStart; } - if (var0 + var2 > Rasterizer2D_xClipEnd) { - var2 = Rasterizer2D_xClipEnd - var0; + if (x + length > Rasterizer2D_xClipEnd) { + length = Rasterizer2D_xClipEnd - x; } - int var5 = 256 - var4; - int var6 = (var3 >> 16 & 255) * var4; - int var7 = (var3 >> 8 & 255) * var4; - int var8 = var4 * (var3 & 255); - int var9 = var0 + Rasterizer2D_width * var1; + int var5 = 256 - alpha; + int var6 = (rgb >> 16 & 255) * alpha; + int var7 = (rgb >> 8 & 255) * alpha; + int var8 = alpha * (rgb & 255); + int var9 = x + Rasterizer2D_width * y; - for (int var10 = 0; var10 < var2; ++var10) { + for (int var10 = 0; var10 < length; ++var10) { int var11 = var5 * (Rasterizer2D_pixels[var9] >> 16 & 255); int var12 = (Rasterizer2D_pixels[var9] >> 8 & 255) * var5; int var13 = var5 * (Rasterizer2D_pixels[var9] & 255); @@ -667,21 +667,21 @@ public class Rasterizer2D extends DualNode { @ObfuscatedName("dm") @Export("Rasterizer2D_drawVerticalLine") - public static void Rasterizer2D_drawVerticalLine(int var0, int var1, int var2, int var3) { - if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { - if (var1 < Rasterizer2D_yClipStart) { - var2 -= Rasterizer2D_yClipStart - var1; - var1 = Rasterizer2D_yClipStart; + public static void Rasterizer2D_drawVerticalLine(int x, int y, int length, int color) { + if (x >= Rasterizer2D_xClipStart && x < Rasterizer2D_xClipEnd) { + if (y < Rasterizer2D_yClipStart) { + length -= Rasterizer2D_yClipStart - y; + y = Rasterizer2D_yClipStart; } - if (var2 + var1 > Rasterizer2D_yClipEnd) { - var2 = Rasterizer2D_yClipEnd - var1; + if (length + y > Rasterizer2D_yClipEnd) { + length = Rasterizer2D_yClipEnd - y; } - int var4 = var0 + Rasterizer2D_width * var1; + int var4 = x + Rasterizer2D_width * y; - for (int var5 = 0; var5 < var2; ++var5) { - Rasterizer2D_pixels[var4 + var5 * Rasterizer2D_width] = var3; + for (int var5 = 0; var5 < length; ++var5) { + Rasterizer2D_pixels[var4 + var5 * Rasterizer2D_width] = color; } } @@ -689,24 +689,24 @@ public class Rasterizer2D extends DualNode { @ObfuscatedName("dq") @Export("Rasterizer2D_drawVerticalLineAlpha") - static void Rasterizer2D_drawVerticalLineAlpha(int var0, int var1, int var2, int var3, int var4) { - if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { - if (var1 < Rasterizer2D_yClipStart) { - var2 -= Rasterizer2D_yClipStart - var1; - var1 = Rasterizer2D_yClipStart; + static void Rasterizer2D_drawVerticalLineAlpha(int x, int y, int length, int rgb, int alpha) { + if (x >= Rasterizer2D_xClipStart && x < Rasterizer2D_xClipEnd) { + if (y < Rasterizer2D_yClipStart) { + length -= Rasterizer2D_yClipStart - y; + y = Rasterizer2D_yClipStart; } - if (var2 + var1 > Rasterizer2D_yClipEnd) { - var2 = Rasterizer2D_yClipEnd - var1; + if (length + y > Rasterizer2D_yClipEnd) { + length = Rasterizer2D_yClipEnd - y; } - int var5 = 256 - var4; - int var6 = (var3 >> 16 & 255) * var4; - int var7 = (var3 >> 8 & 255) * var4; - int var8 = var4 * (var3 & 255); - int var9 = var0 + Rasterizer2D_width * var1; + int var5 = 256 - alpha; + int var6 = (rgb >> 16 & 255) * alpha; + int var7 = (rgb >> 8 & 255) * alpha; + int var8 = alpha * (rgb & 255); + int var9 = x + Rasterizer2D_width * y; - for (int var10 = 0; var10 < var2; ++var10) { + for (int var10 = 0; var10 < length; ++var10) { int var11 = var5 * (Rasterizer2D_pixels[var9] >> 16 & 255); int var12 = (Rasterizer2D_pixels[var9] >> 8 & 255) * var5; int var13 = var5 * (Rasterizer2D_pixels[var9] & 255); @@ -720,78 +720,78 @@ public class Rasterizer2D extends DualNode { @ObfuscatedName("et") @Export("Rasterizer2D_drawLine") - public static void Rasterizer2D_drawLine(int var0, int var1, int var2, int var3, int var4) { - var2 -= var0; - var3 -= var1; - if (var3 == 0) { - if (var2 >= 0) { - Rasterizer2D_drawHorizontalLine(var0, var1, var2 + 1, var4); + public static void Rasterizer2D_drawLine(int x0, int y0, int x1, int y1, int color) { + x1 -= x0; + y1 -= y0; + if (y1 == 0) { + if (x1 >= 0) { + Rasterizer2D_drawHorizontalLine(x0, y0, x1 + 1, color); } else { - Rasterizer2D_drawHorizontalLine(var0 + var2, var1, -var2 + 1, var4); + Rasterizer2D_drawHorizontalLine(x0 + x1, y0, -x1 + 1, color); } - } else if (var2 == 0) { - if (var3 >= 0) { - Rasterizer2D_drawVerticalLine(var0, var1, var3 + 1, var4); + } else if (x1 == 0) { + if (y1 >= 0) { + Rasterizer2D_drawVerticalLine(x0, y0, y1 + 1, color); } else { - Rasterizer2D_drawVerticalLine(var0, var3 + var1, -var3 + 1, var4); + Rasterizer2D_drawVerticalLine(x0, y1 + y0, -y1 + 1, color); } } else { - if (var3 + var2 < 0) { - var0 += var2; - var2 = -var2; - var1 += var3; - var3 = -var3; + if (y1 + x1 < 0) { + x0 += x1; + x1 = -x1; + y0 += y1; + y1 = -y1; } int var5; int var6; - if (var2 > var3) { - var1 <<= 16; - var1 += 32768; - var3 <<= 16; - var5 = (int)Math.floor((double)var3 / (double)var2 + 0.5D); - var2 += var0; - if (var0 < Rasterizer2D_xClipStart) { - var1 += var5 * (Rasterizer2D_xClipStart - var0); - var0 = Rasterizer2D_xClipStart; + if (x1 > y1) { + y0 <<= 16; + y0 += 32768; + y1 <<= 16; + var5 = (int)Math.floor((double)y1 / (double)x1 + 0.5D); + x1 += x0; + if (x0 < Rasterizer2D_xClipStart) { + y0 += var5 * (Rasterizer2D_xClipStart - x0); + x0 = Rasterizer2D_xClipStart; } - if (var2 >= Rasterizer2D_xClipEnd) { - var2 = Rasterizer2D_xClipEnd - 1; + if (x1 >= Rasterizer2D_xClipEnd) { + x1 = Rasterizer2D_xClipEnd - 1; } - while (var0 <= var2) { - var6 = var1 >> 16; + while (x0 <= x1) { + var6 = y0 >> 16; if (var6 >= Rasterizer2D_yClipStart && var6 < Rasterizer2D_yClipEnd) { - Rasterizer2D_pixels[var0 + var6 * Rasterizer2D_width] = var4; + Rasterizer2D_pixels[x0 + var6 * Rasterizer2D_width] = color; } - var1 += var5; - ++var0; + y0 += var5; + ++x0; } } else { - var0 <<= 16; - var0 += 32768; - var2 <<= 16; - var5 = (int)Math.floor((double)var2 / (double)var3 + 0.5D); - var3 += var1; - if (var1 < Rasterizer2D_yClipStart) { - var0 += (Rasterizer2D_yClipStart - var1) * var5; - var1 = Rasterizer2D_yClipStart; + x0 <<= 16; + x0 += 32768; + x1 <<= 16; + var5 = (int)Math.floor((double)x1 / (double)y1 + 0.5D); + y1 += y0; + if (y0 < Rasterizer2D_yClipStart) { + x0 += (Rasterizer2D_yClipStart - y0) * var5; + y0 = Rasterizer2D_yClipStart; } - if (var3 >= Rasterizer2D_yClipEnd) { - var3 = Rasterizer2D_yClipEnd - 1; + if (y1 >= Rasterizer2D_yClipEnd) { + y1 = Rasterizer2D_yClipEnd - 1; } - while (var1 <= var3) { - var6 = var0 >> 16; + while (y0 <= y1) { + var6 = x0 >> 16; if (var6 >= Rasterizer2D_xClipStart && var6 < Rasterizer2D_xClipEnd) { - Rasterizer2D_pixels[var6 + Rasterizer2D_width * var1] = var4; + Rasterizer2D_pixels[var6 + Rasterizer2D_width * y0] = color; } - var0 += var5; - ++var1; + x0 += var5; + ++y0; } } } @@ -800,9 +800,9 @@ public class Rasterizer2D extends DualNode { @ObfuscatedName("eb") @Export("Rasterizer2D_setPixel") - static void Rasterizer2D_setPixel(int var0, int var1, int var2) { - if (var0 >= Rasterizer2D_xClipStart && var1 >= Rasterizer2D_yClipStart && var0 < Rasterizer2D_xClipEnd && var1 < Rasterizer2D_yClipEnd) { - Rasterizer2D_pixels[var0 + Rasterizer2D_width * var1] = var2; + static void Rasterizer2D_setPixel(int x, int y, int color) { + if (x >= Rasterizer2D_xClipStart && y >= Rasterizer2D_yClipStart && x < Rasterizer2D_xClipEnd && y < Rasterizer2D_yClipEnd) { + Rasterizer2D_pixels[x + Rasterizer2D_width * y] = color; } } diff --git a/runescape-client/src/main/java/Rasterizer3D.java b/runescape-client/src/main/java/Rasterizer3D.java index 1723beeb42..5f84a7352c 100644 --- a/runescape-client/src/main/java/Rasterizer3D.java +++ b/runescape-client/src/main/java/Rasterizer3D.java @@ -76,15 +76,15 @@ public class Rasterizer3D extends Rasterizer2D { @ObfuscatedName("f") @Export("Rasterizer3D_setClip") - static final void Rasterizer3D_setClip(int var0, int var1, int var2, int var3) { - Rasterizer3D_clipWidth = var2 - var0; - Rasterizer3D_clipHeight = var3 - var1; + static final void Rasterizer3D_setClip(int xStart, int yStart, int xEnd, int yEnd) { + Rasterizer3D_clipWidth = xEnd - xStart; + Rasterizer3D_clipHeight = yEnd - yStart; Rasterizer3D_method3(); if (Rasterizer3D_rowOffsets.length < Rasterizer3D_clipHeight) { Rasterizer3D_rowOffsets = new int[World.method1759(Rasterizer3D_clipHeight)]; } - int var4 = var0 + Rasterizer2D.Rasterizer2D_width * var1; + int var4 = xStart + Rasterizer2D.Rasterizer2D_width * yStart; for (int var5 = 0; var5 < Rasterizer3D_clipHeight; ++var5) { Rasterizer3D_rowOffsets[var5] = var4; @@ -122,22 +122,22 @@ public class Rasterizer3D extends Rasterizer2D { signature = "(Lei;)V" ) @Export("Rasterizer3D_setTextureLoader") - public static final void Rasterizer3D_setTextureLoader(TextureLoader var0) { - Rasterizer3D_textureLoader = var0; + public static final void Rasterizer3D_setTextureLoader(TextureLoader textureLoader) { + Rasterizer3D_textureLoader = textureLoader; } @ObfuscatedName("u") @Export("Rasterizer3D_setBrightness") - public static final void Rasterizer3D_setBrightness(double var0) { - Rasterizer3D_buildPalette(var0, 0, 512); + public static final void Rasterizer3D_setBrightness(double brightness) { + Rasterizer3D_buildPalette(brightness, 0, 512); } @ObfuscatedName("g") @Export("Rasterizer3D_buildPalette") - static final void Rasterizer3D_buildPalette(double var0, int var2, int var3) { - int var4 = var2 * 128; + static final void Rasterizer3D_buildPalette(double brightness, int hsMin, int hsMax) { + int var4 = hsMin * 128; - for (int var5 = var2; var5 < var3; ++var5) { + for (int var5 = hsMin; var5 < hsMax; ++var5) { double var6 = (double)(var5 >> 3) / 64.0D + 0.0078125D; double var8 = (double)(var5 & 7) / 8.0D + 0.0625D; @@ -200,7 +200,7 @@ public class Rasterizer3D extends Rasterizer2D { int var20 = (int)(var15 * 256.0D); int var27 = (int)(var17 * 256.0D); int var22 = var27 + (var20 << 8) + (var28 << 16); - var22 = Rasterizer3D_brighten(var22, var0); + var22 = Rasterizer3D_brighten(var22, brightness); if (var22 == 0) { var22 = 1; } @@ -213,13 +213,13 @@ public class Rasterizer3D extends Rasterizer2D { @ObfuscatedName("l") @Export("Rasterizer3D_brighten") - static int Rasterizer3D_brighten(int var0, double var1) { - double var3 = (double)(var0 >> 16) / 256.0D; - double var5 = (double)(var0 >> 8 & 255) / 256.0D; - double var7 = (double)(var0 & 255) / 256.0D; - var3 = Math.pow(var3, var1); - var5 = Math.pow(var5, var1); - var7 = Math.pow(var7, var1); + static int Rasterizer3D_brighten(int rgb, double brightness) { + double var3 = (double)(rgb >> 16) / 256.0D; + double var5 = (double)(rgb >> 8 & 255) / 256.0D; + double var7 = (double)(rgb & 255) / 256.0D; + var3 = Math.pow(var3, brightness); + var5 = Math.pow(var5, brightness); + var7 = Math.pow(var7, brightness); int var9 = (int)(var3 * 256.0D); int var10 = (int)(var5 * 256.0D); int var11 = (int)(var7 * 256.0D); @@ -2033,7 +2033,7 @@ public class Rasterizer3D extends Rasterizer2D { int var15 = var6 - var5; int var16; int var10000; - int var17; + int var18; int var19; int var20; int var21; @@ -2077,7 +2077,7 @@ public class Rasterizer3D extends Rasterizer2D { } var2 = (var19 << 20) + var20; - var17 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 20); + var18 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 20); var15 >>= 3; var8 <<= 3; var16 = var7 >> 8; @@ -2086,28 +2086,28 @@ public class Rasterizer3D extends Rasterizer2D { do { var3 = var1[(var2 >>> 26) + (var2 & 4032)]; var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; - var2 += var17; + var2 += var18; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; - var2 += var17; + var2 += var18; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; - var2 += var17; + var2 += var18; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; - var2 += var17; + var2 += var18; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; - var2 += var17; + var2 += var18; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; - var2 += var17; + var2 += var18; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; - var2 += var17; + var2 += var18; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; - var10000 = var17 + var2; + var10000 = var18 + var2; var19 = var21; var20 = var22; var9 += var12; @@ -2128,7 +2128,7 @@ public class Rasterizer3D extends Rasterizer2D { } var2 = (var19 << 20) + var20; - var17 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 20); + var18 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 20); var7 += var8; var16 = var7 >> 8; --var15; @@ -2140,7 +2140,7 @@ public class Rasterizer3D extends Rasterizer2D { do { var3 = var1[(var2 >>> 26) + (var2 & 4032)]; var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; - var2 += var17; + var2 += var18; --var15; } while(var15 > 0); } @@ -2152,49 +2152,49 @@ public class Rasterizer3D extends Rasterizer2D { } ++var4; - var2 += var17; + var2 += var18; if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var17; + var2 += var18; if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var17; + var2 += var18; if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var17; + var2 += var18; if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var17; + var2 += var18; if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var17; + var2 += var18; if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var17; + var2 += var18; if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var10000 = var17 + var2; + var10000 = var18 + var2; var19 = var21; var20 = var22; var9 += var12; @@ -2215,7 +2215,7 @@ public class Rasterizer3D extends Rasterizer2D { } var2 = (var19 << 20) + var20; - var17 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 20); + var18 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 20); var7 += var8; var16 = var7 >> 8; --var15; @@ -2230,7 +2230,7 @@ public class Rasterizer3D extends Rasterizer2D { } ++var4; - var2 += var17; + var2 += var18; --var15; } while(var15 > 0); } @@ -2272,7 +2272,7 @@ public class Rasterizer3D extends Rasterizer2D { } var2 = (var19 << 18) + var20; - var17 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 18); + var18 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 18); var15 >>= 3; var8 <<= 3; var16 = var7 >> 8; @@ -2281,28 +2281,28 @@ public class Rasterizer3D extends Rasterizer2D { do { var3 = var1[(var2 & 16256) + (var2 >>> 25)]; var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; - var2 += var17; + var2 += var18; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; - var2 += var17; + var2 += var18; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; - var2 += var17; + var2 += var18; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; - var2 += var17; + var2 += var18; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; - var2 += var17; + var2 += var18; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; - var2 += var17; + var2 += var18; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; - var2 += var17; + var2 += var18; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; - var10000 = var17 + var2; + var10000 = var18 + var2; var19 = var21; var20 = var22; var9 += var12; @@ -2323,7 +2323,7 @@ public class Rasterizer3D extends Rasterizer2D { } var2 = (var19 << 18) + var20; - var17 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 18); + var18 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 18); var7 += var8; var16 = var7 >> 8; --var15; @@ -2335,7 +2335,7 @@ public class Rasterizer3D extends Rasterizer2D { do { var3 = var1[(var2 & 16256) + (var2 >>> 25)]; var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; - var2 += var17; + var2 += var18; --var15; } while(var15 > 0); } @@ -2347,49 +2347,49 @@ public class Rasterizer3D extends Rasterizer2D { } ++var4; - var2 += var17; + var2 += var18; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var17; + var2 += var18; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var17; + var2 += var18; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var17; + var2 += var18; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var17; + var2 += var18; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var17; + var2 += var18; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var17; + var2 += var18; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var10000 = var17 + var2; + var10000 = var18 + var2; var19 = var21; var20 = var22; var9 += var12; @@ -2410,7 +2410,7 @@ public class Rasterizer3D extends Rasterizer2D { } var2 = (var19 << 18) + var20; - var17 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 18); + var18 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 18); var7 += var8; var16 = var7 >> 8; --var15; @@ -2425,7 +2425,7 @@ public class Rasterizer3D extends Rasterizer2D { } ++var4; - var2 += var17; + var2 += var18; --var15; } while(var15 > 0); } diff --git a/runescape-client/src/main/java/RawPcmStream.java b/runescape-client/src/main/java/RawPcmStream.java index 4137302304..54a3b4136d 100644 --- a/runescape-client/src/main/java/RawPcmStream.java +++ b/runescape-client/src/main/java/RawPcmStream.java @@ -101,9 +101,10 @@ public class RawPcmStream extends PcmStream { } @ObfuscatedName("e") - public synchronized void vmethod263(int[] var1, int var2, int var3) { + @Export("fill") + public synchronized void fill(int[] var1, int var2, int var3) { if (this.field746 == 0 && this.field752 == 0) { - this.vmethod264(var3); + this.skip(var3); } else { RawSound var4 = (RawSound)super.sound; int var5 = this.start << 8; @@ -290,7 +291,8 @@ public class RawPcmStream extends PcmStream { } @ObfuscatedName("d") - public synchronized void vmethod264(int var1) { + @Export("skip") + public synchronized void skip(int var1) { if (this.field752 > 0) { if (var1 >= this.field752) { if (this.field746 == Integer.MIN_VALUE) { diff --git a/runescape-client/src/main/java/RawSound.java b/runescape-client/src/main/java/RawSound.java index c1b0778740..90de54156c 100644 --- a/runescape-client/src/main/java/RawSound.java +++ b/runescape-client/src/main/java/RawSound.java @@ -41,14 +41,14 @@ public class RawSound extends AbstractSound { signature = "(Ldp;)Lcx;" ) @Export("resample") - public RawSound resample(Decimator var1) { - this.samples = var1.resample(this.samples); - this.sampleRate = var1.scaleRate(this.sampleRate); + public RawSound resample(Decimator decimator) { + this.samples = decimator.resample(this.samples); + this.sampleRate = decimator.scaleRate(this.sampleRate); if (this.start == this.end) { - this.start = this.end = var1.scalePosition(this.start); + this.start = this.end = decimator.scalePosition(this.start); } else { - this.start = var1.scalePosition(this.start); - this.end = var1.scalePosition(this.end); + this.start = decimator.scalePosition(this.start); + this.end = decimator.scalePosition(this.end); if (this.start == this.end) { --this.start; } diff --git a/runescape-client/src/main/java/RectangleMode.java b/runescape-client/src/main/java/RectangleMode.java index 53928a6045..8ff42d1569 100644 --- a/runescape-client/src/main/java/RectangleMode.java +++ b/runescape-client/src/main/java/RectangleMode.java @@ -59,8 +59,8 @@ public enum RectangleMode implements Enumerated { signature = "(Lir;Lir;ZB)V", garbageValue = "1" ) - public static void method6028(AbstractIndexCache var0, AbstractIndexCache var1, boolean var2) { - ObjectDefinition.ObjectDefinition_indexCache = var0; + public static void method6028(AbstractArchive var0, AbstractArchive var1, boolean var2) { + ObjectDefinition.ObjectDefinition_archive = var0; ObjectDefinition.field640 = var1; ObjectDefinition.ObjectDefinition_isLowDetail = var2; } diff --git a/runescape-client/src/main/java/RouteStrategy.java b/runescape-client/src/main/java/RouteStrategy.java index 23ce144181..eee9d2ab63 100644 --- a/runescape-client/src/main/java/RouteStrategy.java +++ b/runescape-client/src/main/java/RouteStrategy.java @@ -73,8 +73,8 @@ public abstract class RouteStrategy { garbageValue = "-602741260" ) @Export("loadSpriteFlat") - static boolean loadSpriteFlat(AbstractIndexCache var0, int var1) { - byte[] var2 = var0.takeRecordFlat(var1); + static boolean loadSpriteFlat(AbstractArchive var0, int var1) { + byte[] var2 = var0.takeFileFlat(var1); if (var2 == null) { return false; } else { diff --git a/runescape-client/src/main/java/RunException.java b/runescape-client/src/main/java/RunException.java index 64669fbe91..628262c29a 100644 --- a/runescape-client/src/main/java/RunException.java +++ b/runescape-client/src/main/java/RunException.java @@ -52,13 +52,13 @@ public class RunException extends RuntimeException { garbageValue = "-2146928006" ) public static void method3431() { - Object var0 = IndexStoreActionHandler.IndexStoreActionHandler_lock; - synchronized(IndexStoreActionHandler.IndexStoreActionHandler_lock) { - if (IndexStoreActionHandler.field412 != 0) { - IndexStoreActionHandler.field412 = 1; + Object var0 = ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { + if (ArchiveDiskActionHandler.field412 != 0) { + ArchiveDiskActionHandler.field412 = 1; try { - IndexStoreActionHandler.IndexStoreActionHandler_lock.wait(); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); } catch (InterruptedException var4) { } } diff --git a/runescape-client/src/main/java/Scene.java b/runescape-client/src/main/java/Scene.java index 3fee0d60ae..e07ebe99e3 100644 --- a/runescape-client/src/main/java/Scene.java +++ b/runescape-client/src/main/java/Scene.java @@ -61,8 +61,8 @@ public class Scene { @ObfuscatedSignature( signature = "[Leh;" ) - @Export("Scene_gameObjects") - static GameObject[] Scene_gameObjects; + @Export("gameObjects") + static GameObject[] gameObjects; @ObfuscatedName("ac") @Export("checkClick") static boolean checkClick; @@ -168,8 +168,8 @@ public class Scene { @Export("tiles") Tile[][][] tiles; @ObfuscatedName("g") - @Export("Scene_minPlane") - int Scene_minPlane; + @Export("minPlane") + int minPlane; @ObfuscatedName("l") @Export("tempGameObjectsCount") int tempGameObjectsCount; @@ -187,7 +187,7 @@ public class Scene { int[][] field771; public Scene(int var1, int var2, int var3, int[][][] var4) { - this.Scene_minPlane = 0; + this.minPlane = 0; this.tempGameObjectsCount = 0; this.tempGameObjects = new GameObject[5000]; this.field770 = new int[][]{{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1}, {1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0}, {0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1}, {0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0}, {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0}, {1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1}, {1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0}, {0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1}, {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1}}; @@ -228,21 +228,21 @@ public class Scene { this.tempGameObjectsCount = 0; - for (var1 = 0; var1 < Scene_gameObjects.length; ++var1) { - Scene_gameObjects[var1] = null; + for (var1 = 0; var1 < gameObjects.length; ++var1) { + gameObjects[var1] = null; } } @ObfuscatedName("f") @Export("init") - public void init(int var1) { - this.Scene_minPlane = var1; + public void init(int minPlane) { + this.minPlane = minPlane; for (int var2 = 0; var2 < this.xSize; ++var2) { for (int var3 = 0; var3 < this.ySize; ++var3) { - if (this.tiles[var1][var2][var3] == null) { - this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); + if (this.tiles[minPlane][var2][var3] == null) { + this.tiles[minPlane][var2][var3] = new Tile(minPlane, var2, var3); } } } @@ -251,11 +251,11 @@ public class Scene { @ObfuscatedName("q") @Export("setLinkBelow") - public void setLinkBelow(int var1, int var2) { - Tile var3 = this.tiles[0][var1][var2]; + public void setLinkBelow(int x, int y) { + Tile var3 = this.tiles[0][x][y]; for (int var4 = 0; var4 < 3; ++var4) { - Tile var5 = this.tiles[var4][var1][var2] = this.tiles[var4 + 1][var1][var2]; + Tile var5 = this.tiles[var4][x][y] = this.tiles[var4 + 1][x][y]; if (var5 != null) { --var5.plane; @@ -264,27 +264,27 @@ public class Scene { long var8 = var7.tag; int var10 = (int)(var8 >>> 14 & 3L); boolean var11 = var10 == 2; - if (var11 && var7.startX == var1 && var2 == var7.startY) { + if (var11 && var7.startX == x && y == var7.startY) { --var7.plane; } } } } - if (this.tiles[0][var1][var2] == null) { - this.tiles[0][var1][var2] = new Tile(0, var1, var2); + if (this.tiles[0][x][y] == null) { + this.tiles[0][x][y] = new Tile(0, x, y); } - this.tiles[0][var1][var2].linkedBelowTile = var3; - this.tiles[3][var1][var2] = null; + this.tiles[0][x][y].linkedBelowTile = var3; + this.tiles[3][x][y] = null; } @ObfuscatedName("o") @Export("setTileMinPlane") - public void setTileMinPlane(int var1, int var2, int var3, int var4) { - Tile var5 = this.tiles[var1][var2][var3]; + public void setTileMinPlane(int plane, int x, int y, int minPlane) { + Tile var5 = this.tiles[plane][x][y]; if (var5 != null) { - this.tiles[var1][var2][var3].minPlane = var4; + this.tiles[plane][x][y].minPlane = minPlane; } } @@ -333,20 +333,20 @@ public class Scene { signature = "(IIIILex;JI)V" ) @Export("newFloorDecoration") - public void newFloorDecoration(int var1, int var2, int var3, int var4, Entity var5, long var6, int var8) { - if (var5 != null) { + public void newFloorDecoration(int plane, int x, int y, int tileHeight, Entity entity, long tag, int flags) { + if (entity != null) { FloorDecoration var9 = new FloorDecoration(); - var9.entity = var5; - var9.x = var2 * 128 + 64; - var9.y = var3 * 128 + 64; - var9.tileHeight = var4; - var9.tag = var6; - var9.flags = var8; - if (this.tiles[var1][var2][var3] == null) { - this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); + var9.entity = entity; + var9.x = x * 128 + 64; + var9.y = y * 128 + 64; + var9.tileHeight = tileHeight; + var9.tag = tag; + var9.flags = flags; + if (this.tiles[plane][x][y] == null) { + this.tiles[plane][x][y] = new Tile(plane, x, y); } - this.tiles[var1][var2][var3].floorDecoration = var9; + this.tiles[plane][x][y].floorDecoration = var9; } } @@ -356,17 +356,17 @@ public class Scene { signature = "(IIIILex;JLex;Lex;)V" ) @Export("newGroundItemPile") - public void newGroundItemPile(int var1, int var2, int var3, int var4, Entity var5, long var6, Entity var8, Entity var9) { + public void newGroundItemPile(int plane, int x, int y, int tileHeight, Entity first, long tag, Entity second, Entity third) { GroundItemPile var10 = new GroundItemPile(); - var10.first = var5; - var10.x = var2 * 128 + 64; - var10.y = var3 * 128 + 64; - var10.tileHeight = var4; - var10.tag = var6; - var10.second = var8; - var10.third = var9; + var10.first = first; + var10.x = x * 128 + 64; + var10.y = y * 128 + 64; + var10.tileHeight = tileHeight; + var10.tag = tag; + var10.second = second; + var10.third = third; int var11 = 0; - Tile var12 = this.tiles[var1][var2][var3]; + Tile var12 = this.tiles[plane][x][y]; if (var12 != null) { for (int var13 = 0; var13 < var12.gameObjectsCount; ++var13) { if ((var12.gameObjects[var13].flags & 256) == 256 && var12.gameObjects[var13].entity instanceof Model) { @@ -380,11 +380,11 @@ public class Scene { } var10.height = var11; - if (this.tiles[var1][var2][var3] == null) { - this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); + if (this.tiles[plane][x][y] == null) { + this.tiles[plane][x][y] = new Tile(plane, x, y); } - this.tiles[var1][var2][var3].groundItemPile = var10; + this.tiles[plane][x][y].groundItemPile = var10; } @ObfuscatedName("e") @@ -392,26 +392,26 @@ public class Scene { signature = "(IIIILex;Lex;IIJI)V" ) @Export("newBoundaryObject") - public void newBoundaryObject(int var1, int var2, int var3, int var4, Entity var5, Entity var6, int var7, int var8, long var9, int var11) { - if (var5 != null || var6 != null) { + public void newBoundaryObject(int plane, int x, int y, int tileHeight, Entity entity1, Entity entity2, int orientationA, int orientationB, long tag, int flags) { + if (entity1 != null || entity2 != null) { BoundaryObject var12 = new BoundaryObject(); - var12.tag = var9; - var12.flags = var11; - var12.x = var2 * 128 + 64; - var12.y = var3 * 128 + 64; - var12.tileHeight = var4; - var12.entity1 = var5; - var12.entity2 = var6; - var12.orientationA = var7; - var12.orientationB = var8; + var12.tag = tag; + var12.flags = flags; + var12.x = x * 128 + 64; + var12.y = y * 128 + 64; + var12.tileHeight = tileHeight; + var12.entity1 = entity1; + var12.entity2 = entity2; + var12.orientationA = orientationA; + var12.orientationB = orientationB; - for (int var13 = var1; var13 >= 0; --var13) { - if (this.tiles[var13][var2][var3] == null) { - this.tiles[var13][var2][var3] = new Tile(var13, var2, var3); + for (int var13 = plane; var13 >= 0; --var13) { + if (this.tiles[var13][x][y] == null) { + this.tiles[var13][x][y] = new Tile(var13, x, y); } } - this.tiles[var1][var2][var3].boundaryObject = var12; + this.tiles[plane][x][y].boundaryObject = var12; } } @@ -421,28 +421,28 @@ public class Scene { signature = "(IIIILex;Lex;IIIIJI)V" ) @Export("newWallDecoration") - public void newWallDecoration(int var1, int var2, int var3, int var4, Entity var5, Entity var6, int var7, int var8, int var9, int var10, long var11, int var13) { - if (var5 != null) { + public void newWallDecoration(int plane, int x, int y, int tileHeight, Entity entity1, Entity entity2, int orientation, int int7, int xOffset, int yOffset, long tag, int flags) { + if (entity1 != null) { WallDecoration var14 = new WallDecoration(); - var14.tag = var11; - var14.flags = var13; - var14.x = var2 * 128 + 64; - var14.y = var3 * 128 + 64; - var14.tileHeight = var4; - var14.entity1 = var5; - var14.entity2 = var6; - var14.orientation = var7; - var14.orientation2 = var8; - var14.xOffset = var9; - var14.yOffset = var10; + var14.tag = tag; + var14.flags = flags; + var14.x = x * 128 + 64; + var14.y = y * 128 + 64; + var14.tileHeight = tileHeight; + var14.entity1 = entity1; + var14.entity2 = entity2; + var14.orientation = orientation; + var14.orientation2 = int7; + var14.xOffset = xOffset; + var14.yOffset = yOffset; - for (int var15 = var1; var15 >= 0; --var15) { - if (this.tiles[var15][var2][var3] == null) { - this.tiles[var15][var2][var3] = new Tile(var15, var2, var3); + for (int var15 = plane; var15 >= 0; --var15) { + if (this.tiles[var15][x][y] == null) { + this.tiles[var15][x][y] = new Tile(var15, x, y); } } - this.tiles[var1][var2][var3].wallDecoration = var14; + this.tiles[plane][x][y].wallDecoration = var14; } } @@ -512,15 +512,15 @@ public class Scene { signature = "(IIIIIIIILex;IZJI)Z" ) @Export("newGameObject") - boolean newGameObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, Entity var9, int var10, boolean var11, long var12, int var14) { + boolean newGameObject(int plane, int startX, int startY, int sizeX, int sizeY, int centerX, int centerY, int height, Entity entity, int orientation, boolean isTemp, long tag, int flags) { int var15; - for (int var16 = var2; var16 < var2 + var4; ++var16) { - for (var15 = var3; var15 < var3 + var5; ++var15) { + for (int var16 = startX; var16 < startX + sizeX; ++var16) { + for (var15 = startY; var15 < startY + sizeY; ++var15) { if (var16 < 0 || var15 < 0 || var16 >= this.xSize || var15 >= this.ySize) { return false; } - Tile var17 = this.tiles[var1][var16][var15]; + Tile var17 = this.tiles[plane][var16][var15]; if (var17 != null && var17.gameObjectsCount >= 5) { return false; } @@ -528,45 +528,45 @@ public class Scene { } GameObject var20 = new GameObject(); - var20.tag = var12; - var20.flags = var14; - var20.plane = var1; - var20.centerX = var6; - var20.centerY = var7; - var20.height = var8; - var20.entity = var9; - var20.orientation = var10; - var20.startX = var2; - var20.startY = var3; - var20.endX = var2 + var4 - 1; - var20.endY = var3 + var5 - 1; + var20.tag = tag; + var20.flags = flags; + var20.plane = plane; + var20.centerX = centerX; + var20.centerY = centerY; + var20.height = height; + var20.entity = entity; + var20.orientation = orientation; + var20.startX = startX; + var20.startY = startY; + var20.endX = startX + sizeX - 1; + var20.endY = startY + sizeY - 1; - for (var15 = var2; var15 < var2 + var4; ++var15) { - for (int var21 = var3; var21 < var3 + var5; ++var21) { + for (var15 = startX; var15 < startX + sizeX; ++var15) { + for (int var21 = startY; var21 < startY + sizeY; ++var21) { int var18 = 0; - if (var15 > var2) { + if (var15 > startX) { ++var18; } - if (var15 < var2 + var4 - 1) { + if (var15 < startX + sizeX - 1) { var18 += 4; } - if (var21 > var3) { + if (var21 > startY) { var18 += 8; } - if (var21 < var3 + var5 - 1) { + if (var21 < startY + sizeY - 1) { var18 += 2; } - for (int var19 = var1; var19 >= 0; --var19) { + for (int var19 = plane; var19 >= 0; --var19) { if (this.tiles[var19][var15][var21] == null) { this.tiles[var19][var15][var21] = new Tile(var19, var15, var21); } } - Tile var22 = this.tiles[var1][var15][var21]; + Tile var22 = this.tiles[plane][var15][var21]; var22.gameObjects[var22.gameObjectsCount] = var20; var22.gameObjectEdgeMasks[var22.gameObjectsCount] = var18; var22.gameObjectsEdgeMask |= var18; @@ -574,7 +574,7 @@ public class Scene { } } - if (var11) { + if (isTemp) { this.tempGameObjects[this.tempGameObjectsCount++] = var20; } @@ -598,14 +598,14 @@ public class Scene { signature = "(Leh;)V" ) @Export("removeGameObject") - void removeGameObject(GameObject var1) { - for (int var2 = var1.startX; var2 <= var1.endX; ++var2) { - for (int var3 = var1.startY; var3 <= var1.endY; ++var3) { - Tile var4 = this.tiles[var1.plane][var2][var3]; + void removeGameObject(GameObject gameObject) { + for (int var2 = gameObject.startX; var2 <= gameObject.endX; ++var2) { + for (int var3 = gameObject.startY; var3 <= gameObject.endY; ++var3) { + Tile var4 = this.tiles[gameObject.plane][var2][var3]; if (var4 != null) { int var5; for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { - if (var4.gameObjects[var5] == var1) { + if (var4.gameObjects[var5] == gameObject) { --var4.gameObjectsCount; for (int var6 = var5; var6 < var4.gameObjectsCount; ++var6) { @@ -644,8 +644,8 @@ public class Scene { @ObfuscatedName("h") @Export("removeBoundaryObject") - public void removeBoundaryObject(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; + public void removeBoundaryObject(int plane, int x, int y) { + Tile var4 = this.tiles[plane][x][y]; if (var4 != null) { var4.boundaryObject = null; } @@ -654,8 +654,8 @@ public class Scene { @ObfuscatedName("b") @Export("removeWallDecoration") - public void removeWallDecoration(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; + public void removeWallDecoration(int plane, int x, int y) { + Tile var4 = this.tiles[plane][x][y]; if (var4 != null) { var4.wallDecoration = null; } @@ -682,8 +682,8 @@ public class Scene { @ObfuscatedName("p") @Export("removeFloorDecoration") - public void removeFloorDecoration(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; + public void removeFloorDecoration(int plane, int x, int y) { + Tile var4 = this.tiles[plane][x][y]; if (var4 != null) { var4.floorDecoration = null; } @@ -692,8 +692,8 @@ public class Scene { @ObfuscatedName("v") @Export("removeGroundItemPile") - public void removeGroundItemPile(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; + public void removeGroundItemPile(int plane, int x, int y) { + Tile var4 = this.tiles[plane][x][y]; if (var4 != null) { var4.groundItemPile = null; } @@ -705,8 +705,8 @@ public class Scene { signature = "(III)Lej;" ) @Export("getBoundaryObject") - public BoundaryObject getBoundaryObject(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; + public BoundaryObject getBoundaryObject(int plane, int x, int y) { + Tile var4 = this.tiles[plane][x][y]; return var4 == null ? null : var4.boundaryObject; } @@ -715,8 +715,8 @@ public class Scene { signature = "(III)Leq;" ) @Export("getWallDecoration") - public WallDecoration getWallDecoration(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; + public WallDecoration getWallDecoration(int plane, int x, int y) { + Tile var4 = this.tiles[plane][x][y]; return var4 == null ? null : var4.wallDecoration; } @@ -748,26 +748,29 @@ public class Scene { signature = "(III)Ldo;" ) @Export("getFloorDecoration") - public FloorDecoration getFloorDecoration(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; + public FloorDecoration getFloorDecoration(int plane, int x, int y) { + Tile var4 = this.tiles[plane][x][y]; return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; } @ObfuscatedName("ar") - public long method290(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; + @Export("getBoundaryObjectTag") + public long getBoundaryObjectTag(int plane, int x, int y) { + Tile var4 = this.tiles[plane][x][y]; return var4 != null && var4.boundaryObject != null ? var4.boundaryObject.tag : 0L; } @ObfuscatedName("ac") - public long method291(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; + @Export("getWallDecorationTag") + public long getWallDecorationTag(int plane, int x, int y) { + Tile var4 = this.tiles[plane][x][y]; return var4 != null && var4.wallDecoration != null ? var4.wallDecoration.tag : 0L; } @ObfuscatedName("ay") - public long method292(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; + @Export("getGameObjectTag") + public long getGameObjectTag(int plane, int x, int y) { + Tile var4 = this.tiles[plane][x][y]; if (var4 == null) { return 0L; } else { @@ -776,7 +779,7 @@ public class Scene { long var7 = var6.tag; int var9 = (int)(var7 >>> 14 & 3L); boolean var10 = var9 == 2; - if (var10 && var2 == var6.startX && var3 == var6.startY) { + if (var10 && x == var6.startX && y == var6.startY) { return var6.tag; } } @@ -787,26 +790,26 @@ public class Scene { @ObfuscatedName("ah") @Export("getFloorDecorationTag") - public long getFloorDecorationTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; + public long getFloorDecorationTag(int plane, int x, int y) { + Tile var4 = this.tiles[plane][x][y]; return var4 != null && var4.floorDecoration != null ? var4.floorDecoration.tag : 0L; } @ObfuscatedName("ak") @Export("getObjectFlags") - public int getObjectFlags(int var1, int var2, int var3, long var4) { - Tile var6 = this.tiles[var1][var2][var3]; + public int getObjectFlags(int plane, int x, int y, long tag) { + Tile var6 = this.tiles[plane][x][y]; if (var6 == null) { return -1; - } else if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) { + } else if (var6.boundaryObject != null && var6.boundaryObject.tag == tag) { return var6.boundaryObject.flags & 255; - } else if (var6.wallDecoration != null && var6.wallDecoration.tag == var4) { + } else if (var6.wallDecoration != null && var6.wallDecoration.tag == tag) { return var6.wallDecoration.flags & 255; - } else if (var6.floorDecoration != null && var6.floorDecoration.tag == var4) { + } else if (var6.floorDecoration != null && var6.floorDecoration.tag == tag) { return var6.floorDecoration.flags & 255; } else { for (int var7 = 0; var7 < var6.gameObjectsCount; ++var7) { - if (var6.gameObjects[var7].tag == var4) { + if (var6.gameObjects[var7].tag == tag) { return var6.gameObjects[var7].flags & 255; } } @@ -958,8 +961,8 @@ public class Scene { @ObfuscatedName("ae") @Export("drawTileMinimap") - public void drawTileMinimap(int[] var1, int var2, int var3, int var4, int var5, int var6) { - Tile var7 = this.tiles[var4][var5][var6]; + public void drawTileMinimap(int[] pixels, int index, int width, int plane, int x, int y) { + Tile var7 = this.tiles[plane][x][y]; if (var7 != null) { TilePaint var8 = var7.paint; int var9; @@ -967,11 +970,11 @@ public class Scene { int var10 = var8.rgb; if (var10 != 0) { for (var9 = 0; var9 < 4; ++var9) { - var1[var2] = var10; - var1[var2 + 1] = var10; - var1[var2 + 2] = var10; - var1[var2 + 3] = var10; - var2 += var3; + pixels[index] = var10; + pixels[index + 1] = var10; + pixels[index + 2] = var10; + pixels[index + 3] = var10; + index += width; } } } else { @@ -987,31 +990,31 @@ public class Scene { int var17; if (var12 != 0) { for (var17 = 0; var17 < 4; ++var17) { - var1[var2] = var14[var15[var16++]] == 0 ? var12 : var13; - var1[var2 + 1] = var14[var15[var16++]] == 0 ? var12 : var13; - var1[var2 + 2] = var14[var15[var16++]] == 0 ? var12 : var13; - var1[var2 + 3] = var14[var15[var16++]] == 0 ? var12 : var13; - var2 += var3; + pixels[index] = var14[var15[var16++]] == 0 ? var12 : var13; + pixels[index + 1] = var14[var15[var16++]] == 0 ? var12 : var13; + pixels[index + 2] = var14[var15[var16++]] == 0 ? var12 : var13; + pixels[index + 3] = var14[var15[var16++]] == 0 ? var12 : var13; + index += width; } } else { for (var17 = 0; var17 < 4; ++var17) { if (var14[var15[var16++]] != 0) { - var1[var2] = var13; + pixels[index] = var13; } if (var14[var15[var16++]] != 0) { - var1[var2 + 1] = var13; + pixels[index + 1] = var13; } if (var14[var15[var16++]] != 0) { - var1[var2 + 2] = var13; + pixels[index + 2] = var13; } if (var14[var15[var16++]] != 0) { - var1[var2 + 3] = var13; + pixels[index + 3] = var13; } - var2 += var3; + index += width; } } } @@ -1022,13 +1025,13 @@ public class Scene { @ObfuscatedName("ap") @Export("menuOpen") - public void menuOpen(int var1, int var2, int var3, boolean var4) { + public void menuOpen(int plane, int screenX, int screenY, boolean var4) { if (!method3187() || var4) { checkClick = true; viewportWalking = var4; - Scene_selectedPlane = var1; - Scene_selectedScreenX = var2; - Scene_selectedScreenY = var3; + Scene_selectedPlane = plane; + Scene_selectedScreenX = screenX; + Scene_selectedScreenY = screenY; Scene_selectedX = -1; Scene_selectedY = -1; } @@ -1042,11 +1045,11 @@ public class Scene { @ObfuscatedName("az") @Export("draw") - public void draw(int var1, int var2, int var3, int var4, int var5, int var6) { - if (var1 < 0) { - var1 = 0; - } else if (var1 >= this.xSize * 128) { - var1 = this.xSize * 128 - 1; + public void draw(int x, int y, int var3, int pitch, int yaw, int plane) { + if (x < 0) { + x = 0; + } else if (x >= this.xSize * 128) { + x = this.xSize * 128 - 1; } if (var3 < 0) { @@ -1055,24 +1058,24 @@ public class Scene { var3 = this.ySize * 128 - 1; } - if (var4 < 128) { - var4 = 128; - } else if (var4 > 383) { - var4 = 383; + if (pitch < 128) { + pitch = 128; + } else if (pitch > 383) { + pitch = 383; } ++Scene_drawnCount; - Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var4]; - Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var4]; - Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var5]; - Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var5]; - visibleTiles = visibilityMap[(var4 - 128) / 32][var5 / 64]; - Scene_cameraX = var1; - Scene_cameraY = var2; + Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[pitch]; + Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[pitch]; + Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[yaw]; + Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[yaw]; + visibleTiles = visibilityMap[(pitch - 128) / 32][yaw / 64]; + Scene_cameraX = x; + Scene_cameraY = y; Scene_cameraZ = var3; - Scene_cameraXTile = var1 / 128; + Scene_cameraXTile = x / 128; Scene_cameraYTile = var3 / 128; - Scene_plane = var6; + Scene_plane = plane; Scene_cameraXTileMin = Scene_cameraXTile - 25; if (Scene_cameraXTileMin < 0) { Scene_cameraXTileMin = 0; @@ -1100,14 +1103,14 @@ public class Scene { Tile[][] var8; int var9; int var10; - for (var7 = this.Scene_minPlane; var7 < this.planes; ++var7) { + for (var7 = this.minPlane; var7 < this.planes; ++var7) { var8 = this.tiles[var7]; for (var9 = Scene_cameraXTileMin; var9 < Scene_cameraXTileMax; ++var9) { for (var10 = Scene_cameraYTileMin; var10 < Scene_cameraYTileMax; ++var10) { Tile var11 = var8[var9][var10]; if (var11 != null) { - if (var11.minPlane > var6 || !visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] && this.tileHeights[var7][var9][var10] - var2 < 2000) { + if (var11.minPlane > plane || !visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] && this.tileHeights[var7][var9][var10] - y < 2000) { var11.drawPrimary = false; var11.drawSecondary = false; var11.drawGameObjectEdges = 0; @@ -1128,48 +1131,48 @@ public class Scene { } int var12; - int var13; - Tile var14; + Tile var13; + int var14; int var15; int var16; - for (var7 = this.Scene_minPlane; var7 < this.planes; ++var7) { + for (var7 = this.minPlane; var7 < this.planes; ++var7) { var8 = this.tiles[var7]; for (var9 = -25; var9 <= 0; ++var9) { var10 = var9 + Scene_cameraXTile; - var15 = Scene_cameraXTile - var9; - if (var10 >= Scene_cameraXTileMin || var15 < Scene_cameraXTileMax) { - for (var16 = -25; var16 <= 0; ++var16) { - var12 = var16 + Scene_cameraYTile; - var13 = Scene_cameraYTile - var16; + var14 = Scene_cameraXTile - var9; + if (var10 >= Scene_cameraXTileMin || var14 < Scene_cameraXTileMax) { + for (var15 = -25; var15 <= 0; ++var15) { + var16 = var15 + Scene_cameraYTile; + var12 = Scene_cameraYTile - var15; if (var10 >= Scene_cameraXTileMin) { - if (var12 >= Scene_cameraYTileMin) { - var14 = var8[var10][var12]; - if (var14 != null && var14.drawPrimary) { - this.drawTile(var14, true); + if (var16 >= Scene_cameraYTileMin) { + var13 = var8[var10][var16]; + if (var13 != null && var13.drawPrimary) { + this.drawTile(var13, true); } } - if (var13 < Scene_cameraYTileMax) { - var14 = var8[var10][var13]; - if (var14 != null && var14.drawPrimary) { - this.drawTile(var14, true); + if (var12 < Scene_cameraYTileMax) { + var13 = var8[var10][var12]; + if (var13 != null && var13.drawPrimary) { + this.drawTile(var13, true); } } } - if (var15 < Scene_cameraXTileMax) { - if (var12 >= Scene_cameraYTileMin) { - var14 = var8[var15][var12]; - if (var14 != null && var14.drawPrimary) { - this.drawTile(var14, true); + if (var14 < Scene_cameraXTileMax) { + if (var16 >= Scene_cameraYTileMin) { + var13 = var8[var14][var16]; + if (var13 != null && var13.drawPrimary) { + this.drawTile(var13, true); } } - if (var13 < Scene_cameraYTileMax) { - var14 = var8[var15][var13]; - if (var14 != null && var14.drawPrimary) { - this.drawTile(var14, true); + if (var12 < Scene_cameraYTileMax) { + var13 = var8[var14][var12]; + if (var13 != null && var13.drawPrimary) { + this.drawTile(var13, true); } } } @@ -1183,44 +1186,44 @@ public class Scene { } } - for (var7 = this.Scene_minPlane; var7 < this.planes; ++var7) { + for (var7 = this.minPlane; var7 < this.planes; ++var7) { var8 = this.tiles[var7]; for (var9 = -25; var9 <= 0; ++var9) { var10 = var9 + Scene_cameraXTile; - var15 = Scene_cameraXTile - var9; - if (var10 >= Scene_cameraXTileMin || var15 < Scene_cameraXTileMax) { - for (var16 = -25; var16 <= 0; ++var16) { - var12 = var16 + Scene_cameraYTile; - var13 = Scene_cameraYTile - var16; + var14 = Scene_cameraXTile - var9; + if (var10 >= Scene_cameraXTileMin || var14 < Scene_cameraXTileMax) { + for (var15 = -25; var15 <= 0; ++var15) { + var16 = var15 + Scene_cameraYTile; + var12 = Scene_cameraYTile - var15; if (var10 >= Scene_cameraXTileMin) { - if (var12 >= Scene_cameraYTileMin) { - var14 = var8[var10][var12]; - if (var14 != null && var14.drawPrimary) { - this.drawTile(var14, false); + if (var16 >= Scene_cameraYTileMin) { + var13 = var8[var10][var16]; + if (var13 != null && var13.drawPrimary) { + this.drawTile(var13, false); } } - if (var13 < Scene_cameraYTileMax) { - var14 = var8[var10][var13]; - if (var14 != null && var14.drawPrimary) { - this.drawTile(var14, false); + if (var12 < Scene_cameraYTileMax) { + var13 = var8[var10][var12]; + if (var13 != null && var13.drawPrimary) { + this.drawTile(var13, false); } } } - if (var15 < Scene_cameraXTileMax) { - if (var12 >= Scene_cameraYTileMin) { - var14 = var8[var15][var12]; - if (var14 != null && var14.drawPrimary) { - this.drawTile(var14, false); + if (var14 < Scene_cameraXTileMax) { + if (var16 >= Scene_cameraYTileMin) { + var13 = var8[var14][var16]; + if (var13 != null && var13.drawPrimary) { + this.drawTile(var13, false); } } - if (var13 < Scene_cameraYTileMax) { - var14 = var8[var15][var13]; - if (var14 != null && var14.drawPrimary) { - this.drawTile(var14, false); + if (var12 < Scene_cameraYTileMax) { + var13 = var8[var14][var12]; + if (var13 != null && var13.drawPrimary) { + this.drawTile(var13, false); } } } @@ -1242,8 +1245,8 @@ public class Scene { signature = "(Ldj;Z)V" ) @Export("drawTile") - void drawTile(Tile var1, boolean var2) { - Scene_tilesDeque.addFirst(var1); + void drawTile(Tile tile, boolean var2) { + Scene_tilesDeque.addFirst(tile); while (true) { Tile var3; @@ -1342,13 +1345,13 @@ public class Scene { var16 = var9.boundaryObject; if (var16 != null) { - var16.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var16.x - Scene_cameraX, var16.tileHeight - Scene_cameraY, var16.y - Scene_cameraZ, var16.tag); + var16.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var16.x - Scene_cameraX, var16.tileHeight - Scene_cameraY, var16.y - Scene_cameraZ, var16.tag); } for (var10 = 0; var10 < var9.gameObjectsCount; ++var10) { var17 = var9.gameObjects[var10]; if (var17 != null) { - var17.entity.renderDraw(var17.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var17.centerX - Scene_cameraX, var17.height - Scene_cameraY, var17.centerY - Scene_cameraZ, var17.tag); + var17.entity.draw(var17.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var17.centerX - Scene_cameraX, var17.height - Scene_cameraY, var17.centerY - Scene_cameraZ, var17.tag); } } } @@ -1411,17 +1414,17 @@ public class Scene { } if ((var23.orientationA & var10) != 0 && !this.method298(var7, var4, var5, var23.orientationA)) { - var23.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); + var23.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); } if ((var23.orientationB & var10) != 0 && !this.method298(var7, var4, var5, var23.orientationB)) { - var23.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); + var23.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); } } if (var24 != null && !this.method299(var7, var4, var5, var24.entity1.height)) { if ((var24.orientation & var10) != 0) { - var24.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var24.x - Scene_cameraX + var24.xOffset, var24.tileHeight - Scene_cameraY, var24.y - Scene_cameraZ + var24.yOffset, var24.tag); + var24.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var24.x - Scene_cameraX + var24.xOffset, var24.tileHeight - Scene_cameraY, var24.y - Scene_cameraZ + var24.yOffset, var24.tag); } else if (var24.orientation == 256) { var11 = var24.x - Scene_cameraX; var12 = var24.tileHeight - Scene_cameraY; @@ -1441,9 +1444,9 @@ public class Scene { } if (var25 < var19) { - var24.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11 + var24.xOffset, var12, var13 + var24.yOffset, var24.tag); + var24.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11 + var24.xOffset, var12, var13 + var24.yOffset, var24.tag); } else if (var24.entity2 != null) { - var24.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11, var12, var13, var24.tag); + var24.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11, var12, var13, var24.tag); } } } @@ -1451,21 +1454,21 @@ public class Scene { if (var20) { FloorDecoration var34 = var3.floorDecoration; if (var34 != null) { - var34.entity.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var34.x - Scene_cameraX, var34.tileHeight - Scene_cameraY, var34.y - Scene_cameraZ, var34.tag); + var34.entity.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var34.x - Scene_cameraX, var34.tileHeight - Scene_cameraY, var34.y - Scene_cameraZ, var34.tag); } GroundItemPile var26 = var3.groundItemPile; if (var26 != null && var26.height == 0) { if (var26.second != null) { - var26.second.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var26.x - Scene_cameraX, var26.tileHeight - Scene_cameraY, var26.y - Scene_cameraZ, var26.tag); + var26.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var26.x - Scene_cameraX, var26.tileHeight - Scene_cameraY, var26.y - Scene_cameraZ, var26.tag); } if (var26.third != null) { - var26.third.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var26.x - Scene_cameraX, var26.tileHeight - Scene_cameraY, var26.y - Scene_cameraZ, var26.tag); + var26.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var26.x - Scene_cameraX, var26.tileHeight - Scene_cameraY, var26.y - Scene_cameraZ, var26.tag); } if (var26.first != null) { - var26.first.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var26.x - Scene_cameraX, var26.tileHeight - Scene_cameraY, var26.y - Scene_cameraZ, var26.tag); + var26.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var26.x - Scene_cameraX, var26.tileHeight - Scene_cameraY, var26.y - Scene_cameraZ, var26.tag); } } } @@ -1516,7 +1519,7 @@ public class Scene { if (var20) { var16 = var3.boundaryObject; if (!this.method298(var7, var4, var5, var16.orientationA)) { - var16.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var16.x - Scene_cameraX, var16.tileHeight - Scene_cameraY, var16.y - Scene_cameraZ, var16.tag); + var16.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var16.x - Scene_cameraX, var16.tileHeight - Scene_cameraY, var16.y - Scene_cameraZ, var16.tag); } var3.drawGameObjectEdges = 0; @@ -1570,7 +1573,7 @@ public class Scene { } } - Scene_gameObjects[var21++] = var17; + gameObjects[var21++] = var17; var14 = Scene_cameraXTile - var17.startX; var11 = var17.endX - Scene_cameraXTile; if (var11 > var14) { @@ -1593,7 +1596,7 @@ public class Scene { GameObject var33; for (var14 = 0; var14 < var21; ++var14) { - var33 = Scene_gameObjects[var14]; + var33 = gameObjects[var14]; if (var33.lastDrawn != Scene_drawnCount) { if (var33.field360 > var10) { var10 = var33.field360; @@ -1601,8 +1604,8 @@ public class Scene { } else if (var10 == var33.field360) { var12 = var33.centerX - Scene_cameraX; var13 = var33.centerY - Scene_cameraZ; - var18 = Scene_gameObjects[var15].centerX - Scene_cameraX; - var19 = Scene_gameObjects[var15].centerY - Scene_cameraZ; + var18 = gameObjects[var15].centerX - Scene_cameraX; + var19 = gameObjects[var15].centerY - Scene_cameraZ; if (var12 * var12 + var13 * var13 > var18 * var18 + var19 * var19) { var15 = var14; } @@ -1614,10 +1617,10 @@ public class Scene { break; } - var33 = Scene_gameObjects[var15]; + var33 = gameObjects[var15]; var33.lastDrawn = Scene_drawnCount; if (!this.method300(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.entity.height)) { - var33.entity.renderDraw(var33.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var33.centerX - Scene_cameraX, var33.height - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag); + var33.entity.draw(var33.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var33.centerX - Scene_cameraX, var33.height - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag); } for (var11 = var33.startX; var11 <= var33.endX; ++var11) { @@ -1676,15 +1679,15 @@ public class Scene { GroundItemPile var28 = var3.groundItemPile; if (var28 != null && var28.height != 0) { if (var28.second != null) { - var28.second.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var28.x - Scene_cameraX, var28.tileHeight - Scene_cameraY - var28.height, var28.y - Scene_cameraZ, var28.tag); + var28.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var28.x - Scene_cameraX, var28.tileHeight - Scene_cameraY - var28.height, var28.y - Scene_cameraZ, var28.tag); } if (var28.third != null) { - var28.third.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var28.x - Scene_cameraX, var28.tileHeight - Scene_cameraY - var28.height, var28.y - Scene_cameraZ, var28.tag); + var28.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var28.x - Scene_cameraX, var28.tileHeight - Scene_cameraY - var28.height, var28.y - Scene_cameraZ, var28.tag); } if (var28.first != null) { - var28.first.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var28.x - Scene_cameraX, var28.tileHeight - Scene_cameraY - var28.height, var28.y - Scene_cameraZ, var28.tag); + var28.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var28.x - Scene_cameraX, var28.tileHeight - Scene_cameraY - var28.height, var28.y - Scene_cameraZ, var28.tag); } } @@ -1692,7 +1695,7 @@ public class Scene { WallDecoration var29 = var3.wallDecoration; if (var29 != null && !this.method299(var7, var4, var5, var29.entity1.height)) { if ((var29.orientation & var3.field899) != 0) { - var29.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.x - Scene_cameraX + var29.xOffset, var29.tileHeight - Scene_cameraY, var29.y - Scene_cameraZ + var29.yOffset, var29.tag); + var29.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.x - Scene_cameraX + var29.xOffset, var29.tileHeight - Scene_cameraY, var29.y - Scene_cameraZ + var29.yOffset, var29.tag); } else if (var29.orientation == 256) { var10 = var29.x - Scene_cameraX; var15 = var29.tileHeight - Scene_cameraY; @@ -1711,9 +1714,9 @@ public class Scene { } if (var13 >= var12) { - var29.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10 + var29.xOffset, var15, var14 + var29.yOffset, var29.tag); + var29.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10 + var29.xOffset, var15, var14 + var29.yOffset, var29.tag); } else if (var29.entity2 != null) { - var29.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10, var15, var14, var29.tag); + var29.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10, var15, var14, var29.tag); } } } @@ -1721,11 +1724,11 @@ public class Scene { BoundaryObject var31 = var3.boundaryObject; if (var31 != null) { if ((var31.orientationB & var3.field899) != 0 && !this.method298(var7, var4, var5, var31.orientationB)) { - var31.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag); + var31.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag); } if ((var31.orientationA & var3.field899) != 0 && !this.method298(var7, var4, var5, var31.orientationA)) { - var31.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag); + var31.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag); } } } @@ -2417,13 +2420,13 @@ public class Scene { @ObfuscatedName("at") @Export("Scene_buildVisiblityMap") - public static void Scene_buildVisiblityMap(int[] var0, int var1, int var2, int var3, int var4) { + public static void Scene_buildVisiblityMap(int[] var0, int var1, int var2, int viewportWidth, int viewportHeight) { Scene_viewportXMin = 0; Scene_viewportYMin = 0; - Scene_viewportXMax = var3; - Scene_viewportYMax = var4; - Scene_viewportXCenter = var3 / 2; - Scene_viewportYCenter = var4 / 2; + Scene_viewportXMax = viewportWidth; + Scene_viewportYMax = viewportHeight; + Scene_viewportXCenter = viewportWidth / 2; + Scene_viewportYCenter = viewportHeight / 2; boolean[][][][] var5 = new boolean[var0.length][32][53][53]; int var6; @@ -2560,7 +2563,7 @@ public class Scene { Scene_isLowDetail = true; tileUpdateCount = 0; Scene_plane = 0; - Scene_gameObjects = new GameObject[100]; + gameObjects = new GameObject[100]; checkClick = false; Scene_selectedPlane = 0; Scene_selectedScreenX = 0; diff --git a/runescape-client/src/main/java/ScriptEvent.java b/runescape-client/src/main/java/ScriptEvent.java index 2238fe002f..6e2d40c75f 100644 --- a/runescape-client/src/main/java/ScriptEvent.java +++ b/runescape-client/src/main/java/ScriptEvent.java @@ -3,6 +3,7 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("by") @Implements("ScriptEvent") @@ -92,8 +93,8 @@ public class ScriptEvent extends Node { garbageValue = "723852511" ) @Export("setArgs") - public void setArgs(Object[] var1) { - this.args0 = var1; + public void setArgs(Object[] args) { + this.args0 = args; } @ObfuscatedName("f") @@ -102,8 +103,8 @@ public class ScriptEvent extends Node { garbageValue = "-110" ) @Export("setType") - public void setType(int var1) { - this.type0 = var1; + public void setType(int type) { + this.type0 = type; } @ObfuscatedName("j") @@ -112,51 +113,51 @@ public class ScriptEvent extends Node { garbageValue = "0" ) static int method1185(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111; - if (var0 == 1600) { + Widget var3 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111; + if (var0 == ScriptOpcodes.CC_GETSCROLLX) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollX; return 1; - } else if (var0 == 1601) { + } else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollY; return 1; - } else if (var0 == 1602) { + } else if (var0 == ScriptOpcodes.CC_GETTEXT) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.text; return 1; - } else if (var0 == 1603) { + } else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollWidth; return 1; - } else if (var0 == 1604) { + } else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollHeight; return 1; - } else if (var0 == 1605) { + } else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelZoom; return 1; - } else if (var0 == 1606) { + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelAngleX; return 1; - } else if (var0 == 1607) { + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelAngleZ; return 1; - } else if (var0 == 1608) { + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelAngleY; return 1; - } else if (var0 == 1609) { + } else if (var0 == ScriptOpcodes.CC_GETTRANS) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.transparency; return 1; } else if (var0 == 1610) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.field960; return 1; - } else if (var0 == 1611) { + } else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.color; return 1; - } else if (var0 == 1612) { + } else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.color2; return 1; } else if (var0 == 1613) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.rectangleMode.rsOrdinal(); return 1; } else if (var0 == 1614) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.field964 ? 1 : 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; return 1; } else { return 2; @@ -169,119 +170,119 @@ public class ScriptEvent extends Node { garbageValue = "1256509027" ) static int method1187(int var0, Script var1, boolean var2) { - if (var0 == 3300) { + if (var0 == ScriptOpcodes.CLIENTCLOCK) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.cycle; return 1; } else { int var3; int var4; - if (var0 == 3301) { + if (var0 == ScriptOpcodes.INV_GETOBJ) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class83.method2027(var3, var4); return 1; - } else if (var0 == 3302) { + } else if (var0 == ScriptOpcodes.INV_GETNUM) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapLabel.method442(var3, var4); return 1; - } else if (var0 == 3303) { + } else if (var0 == ScriptOpcodes.INV_TOTAL) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class1.method18(var3, var4); return 1; - } else if (var0 == 3304) { + } else if (var0 == ScriptOpcodes.INV_SIZE) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapDecorationType.method4523(var3).size; return 1; - } else if (var0 == 3305) { + } else if (var0 == ScriptOpcodes.STAT) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; return 1; - } else if (var0 == 3306) { + } else if (var0 == ScriptOpcodes.STAT_BASE) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.levels[var3]; return 1; - } else if (var0 == 3307) { + } else if (var0 == ScriptOpcodes.STAT_XP) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.experience[var3]; return 1; } else { int var5; - if (var0 == 3308) { + if (var0 == ScriptOpcodes.COORD) { var3 = SoundSystem.plane; var4 = (Canvas.localPlayer.x >> 7) + class50.baseX; var5 = (Canvas.localPlayer.y >> 7) + GraphicsObject.baseY; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); return 1; - } else if (var0 == 3309) { + } else if (var0 == ScriptOpcodes.COORDX) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; return 1; - } else if (var0 == 3310) { + } else if (var0 == ScriptOpcodes.COORDZ) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 >> 28; return 1; - } else if (var0 == 3311) { + } else if (var0 == ScriptOpcodes.COORDY) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 & 16383; return 1; - } else if (var0 == 3312) { + } else if (var0 == ScriptOpcodes.MAP_MEMBERS) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; return 1; - } else if (var0 == 3313) { + } else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] + 32768; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class83.method2027(var3, var4); return 1; - } else if (var0 == 3314) { + } else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] + 32768; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapLabel.method442(var3, var4); return 1; - } else if (var0 == 3315) { + } else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] + 32768; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class1.method18(var3, var4); return 1; - } else if (var0 == 3316) { - if (Client.rights >= 2) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.rights; + } else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { + if (Client.staffModLevel >= 2) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.staffModLevel; } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } return 1; - } else if (var0 == 3317) { + } else if (var0 == ScriptOpcodes.REBOOTTIMER) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.rebootTimer; return 1; - } else if (var0 == 3318) { + } else if (var0 == ScriptOpcodes.MAP_WORLD) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.worldId; return 1; - } else if (var0 == 3321) { + } else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.runEnergy; return 1; - } else if (var0 == 3322) { + } else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.weight; return 1; - } else if (var0 == 3323) { - if (Client.field155) { + } else if (var0 == ScriptOpcodes.PLAYERMOD) { + if (Client.playerMod) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1; } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } return 1; - } else if (var0 == 3324) { + } else if (var0 == ScriptOpcodes.WORLDFLAGS) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.worldProperties; return 1; - } else if (var0 == 3325) { + } else if (var0 == ScriptOpcodes.MOVECOORD) { RouteStrategy.Interpreter_intStackSize -= 4; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; diff --git a/runescape-client/src/main/java/ScriptFrame.java b/runescape-client/src/main/java/ScriptFrame.java index e86e4aea9d..dae5cef950 100644 --- a/runescape-client/src/main/java/ScriptFrame.java +++ b/runescape-client/src/main/java/ScriptFrame.java @@ -36,12 +36,12 @@ public class ScriptFrame { garbageValue = "-1726705535" ) @Export("findEnumerated") - public static Enumerated findEnumerated(Enumerated[] var0, int var1) { - Enumerated[] var2 = var0; + public static Enumerated findEnumerated(Enumerated[] values, int ordinal) { + Enumerated[] var2 = values; for (int var3 = 0; var3 < var2.length; ++var3) { Enumerated var4 = var2[var3]; - if (var1 == var4.rsOrdinal()) { + if (ordinal == var4.rsOrdinal()) { return var4; } } diff --git a/runescape-client/src/main/java/SecureRandomCallable.java b/runescape-client/src/main/java/SecureRandomCallable.java index e976ebcffa..22a36b63d4 100644 --- a/runescape-client/src/main/java/SecureRandomCallable.java +++ b/runescape-client/src/main/java/SecureRandomCallable.java @@ -36,10 +36,10 @@ public class SecureRandomCallable implements Callable { if (var1 != null) { return var1; } else { - byte[] var2 = VarpDefinition.field943.takeRecord(16, var0); + byte[] var2 = VarpDefinition.field943.takeFile(16, var0); var1 = new VarpDefinition(); if (var2 != null) { - var1.read(new Buffer(var2)); + var1.decode(new Buffer(var2)); } VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); @@ -52,11 +52,11 @@ public class SecureRandomCallable implements Callable { signature = "(IIII)Lbx;", garbageValue = "329127611" ) - static final WidgetGroupParent method1143(int var0, int var1, int var2) { - WidgetGroupParent var3 = new WidgetGroupParent(); + static final InterfaceParent method1143(int var0, int var1, int var2) { + InterfaceParent var3 = new InterfaceParent(); var3.group = var1; var3.type = var2; - Client.widgetGroupParents.put(var3, (long)var0); + Client.interfaceParents.put(var3, (long)var0); DevicePcmPlayerProvider.method845(var1); Widget var4 = Huffman.getWidget(var0); class22.method295(var4); @@ -132,10 +132,10 @@ public class SecureRandomCallable implements Callable { GameShell.menuY = var13; class214.menuWidth = var7; AbstractWorldMapIcon.menuHeight = Client.menuOptionsCount * 15 + 22; - class39.revalidateWidgetScroll(Widget.widgets[var0 >> 16], var4, false); + class39.revalidateWidgetScroll(Widget.interfaceComponents[var0 >> 16], var4, false); WorldMapSection3.runWidgetOnLoadListener(var1); - if (Client.rootWidgetGroup != -1) { - GrandExchangeEvents.method74(Client.rootWidgetGroup, 1); + if (Client.rootInterface != -1) { + GrandExchangeEvents.method74(Client.rootInterface, 1); } return var3; diff --git a/runescape-client/src/main/java/SecureRandomFuture.java b/runescape-client/src/main/java/SecureRandomFuture.java index 378872b26b..ee7a481b1e 100644 --- a/runescape-client/src/main/java/SecureRandomFuture.java +++ b/runescape-client/src/main/java/SecureRandomFuture.java @@ -21,8 +21,8 @@ public class SecureRandomFuture { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache5") - static IndexCache indexCache5; + @Export("archive5") + static Archive archive5; @ObfuscatedName("jn") @ObfuscatedSignature( signature = "Ldl;" diff --git a/runescape-client/src/main/java/SequenceDefinition.java b/runescape-client/src/main/java/SequenceDefinition.java index 134ea54929..3db6636931 100644 --- a/runescape-client/src/main/java/SequenceDefinition.java +++ b/runescape-client/src/main/java/SequenceDefinition.java @@ -11,18 +11,18 @@ public class SequenceDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("SequenceDefinition_indexCache") - public static AbstractIndexCache SequenceDefinition_indexCache; + @Export("SequenceDefinition_archive") + public static AbstractArchive SequenceDefinition_archive; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field773; + public static AbstractArchive field773; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field774; + public static AbstractArchive field774; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Ler;" @@ -110,15 +110,15 @@ public class SequenceDefinition extends DualNode { signature = "(Lgr;S)V", garbageValue = "259" ) - @Export("read") - void read(Buffer var1) { + @Export("decode") + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -127,40 +127,40 @@ public class SequenceDefinition extends DualNode { signature = "(Lgr;II)V", garbageValue = "154075720" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { - int[] var10000; - int var3; + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { + int[] var3; int var4; + int var5; if (var2 == 1) { - var3 = var1.readUnsignedShort(); - this.frameLengths = new int[var3]; + var4 = var1.readUnsignedShort(); + this.frameLengths = new int[var4]; - for (var4 = 0; var4 < var3; ++var4) { - this.frameLengths[var4] = var1.readUnsignedShort(); + for (var5 = 0; var5 < var4; ++var5) { + this.frameLengths[var5] = var1.readUnsignedShort(); } - this.frameIds = new int[var3]; + this.frameIds = new int[var4]; - for (var4 = 0; var4 < var3; ++var4) { - this.frameIds[var4] = var1.readUnsignedShort(); + for (var5 = 0; var5 < var4; ++var5) { + this.frameIds[var5] = var1.readUnsignedShort(); } - for (var4 = 0; var4 < var3; ++var4) { - var10000 = this.frameIds; - var10000[var4] += var1.readUnsignedShort() << 16; + for (var5 = 0; var5 < var4; ++var5) { + var3 = this.frameIds; + var3[var5] += var1.readUnsignedShort() << 16; } } else if (var2 == 2) { this.frameCount = var1.readUnsignedShort(); } else if (var2 == 3) { - var3 = var1.readUnsignedByte(); - this.field777 = new int[var3 + 1]; + var4 = var1.readUnsignedByte(); + this.field777 = new int[var4 + 1]; - for (var4 = 0; var4 < var3; ++var4) { - this.field777[var4] = var1.readUnsignedByte(); + for (var5 = 0; var5 < var4; ++var5) { + this.field777[var5] = var1.readUnsignedByte(); } - this.field777[var3] = 9999999; + this.field777[var4] = 9999999; } else if (var2 == 4) { this.field778 = true; } else if (var2 == 5) { @@ -178,23 +178,23 @@ public class SequenceDefinition extends DualNode { } else if (var2 == 11) { this.field783 = var1.readUnsignedByte(); } else if (var2 == 12) { - var3 = var1.readUnsignedByte(); - this.frameIds2 = new int[var3]; + var4 = var1.readUnsignedByte(); + this.frameIds2 = new int[var4]; - for (var4 = 0; var4 < var3; ++var4) { - this.frameIds2[var4] = var1.readUnsignedShort(); + for (var5 = 0; var5 < var4; ++var5) { + this.frameIds2[var5] = var1.readUnsignedShort(); } - for (var4 = 0; var4 < var3; ++var4) { - var10000 = this.frameIds2; - var10000[var4] += var1.readUnsignedShort() << 16; + for (var5 = 0; var5 < var4; ++var5) { + var3 = this.frameIds2; + var3[var5] += var1.readUnsignedShort() << 16; } } else if (var2 == 13) { - var3 = var1.readUnsignedByte(); - this.field776 = new int[var3]; + var4 = var1.readUnsignedByte(); + this.field776 = new int[var4]; - for (var4 = 0; var4 < var3; ++var4) { - this.field776[var4] = var1.readMedium(); + for (var5 = 0; var5 < var4; ++var5) { + this.field776[var5] = var1.readMedium(); } } @@ -205,8 +205,8 @@ public class SequenceDefinition extends DualNode { signature = "(B)V", garbageValue = "1" ) - @Export("init") - void init() { + @Export("postDecode") + void postDecode() { if (this.field781 == -1) { if (this.field777 != null) { this.field781 = 2; @@ -231,15 +231,15 @@ public class SequenceDefinition extends DualNode { garbageValue = "128527714" ) @Export("animateSequence") - public Model animateSequence(Model var1, int var2) { - var2 = this.frameIds[var2]; - Frames var3 = ItemContainer.getFrames(var2 >> 16); - var2 &= 65535; + public Model animateSequence(Model model, int frame) { + frame = this.frameIds[frame]; + Frames var3 = ItemContainer.getFrames(frame >> 16); + frame &= 65535; if (var3 == null) { - return var1.toSharedSequenceModel(true); + return model.toSharedSequenceModel(true); } else { - Model var4 = var1.toSharedSequenceModel(!var3.hasAlphaTransform(var2)); - var4.animate(var3, var2); + Model var4 = model.toSharedSequenceModel(!var3.hasAlphaTransform(frame)); + var4.animate(var3, frame); return var4; } } @@ -250,29 +250,29 @@ public class SequenceDefinition extends DualNode { garbageValue = "-65" ) @Export("animateObject") - Model animateObject(Model var1, int var2, int var3) { - var2 = this.frameIds[var2]; - Frames var4 = ItemContainer.getFrames(var2 >> 16); - var2 &= 65535; + Model animateObject(Model model, int frame, int orientation) { + frame = this.frameIds[frame]; + Frames var4 = ItemContainer.getFrames(frame >> 16); + frame &= 65535; if (var4 == null) { - return var1.toSharedSequenceModel(true); + return model.toSharedSequenceModel(true); } else { - Model var5 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var2)); - var3 &= 3; - if (var3 == 1) { + Model var5 = model.toSharedSequenceModel(!var4.hasAlphaTransform(frame)); + orientation &= 3; + if (orientation == 1) { var5.rotateY270Ccw(); - } else if (var3 == 2) { + } else if (orientation == 2) { var5.rotateY180(); - } else if (var3 == 3) { + } else if (orientation == 3) { var5.rotateY90Ccw(); } - var5.animate(var4, var2); - if (var3 == 1) { + var5.animate(var4, frame); + if (orientation == 1) { var5.rotateY90Ccw(); - } else if (var3 == 2) { + } else if (orientation == 2) { var5.rotateY180(); - } else if (var3 == 3) { + } else if (orientation == 3) { var5.rotateY270Ccw(); } @@ -286,15 +286,15 @@ public class SequenceDefinition extends DualNode { garbageValue = "-1692496767" ) @Export("animateSpotAnimation") - Model animateSpotAnimation(Model var1, int var2) { - var2 = this.frameIds[var2]; - Frames var3 = ItemContainer.getFrames(var2 >> 16); - var2 &= 65535; + Model animateSpotAnimation(Model model, int frame) { + frame = this.frameIds[frame]; + Frames var3 = ItemContainer.getFrames(frame >> 16); + frame &= 65535; if (var3 == null) { - return var1.toSharedSpotAnimationModel(true); + return model.toSharedSpotAnimationModel(true); } else { - Model var4 = var1.toSharedSpotAnimationModel(!var3.hasAlphaTransform(var2)); - var4.animate(var3, var2); + Model var4 = model.toSharedSpotAnimationModel(!var3.hasAlphaTransform(frame)); + var4.animate(var3, frame); return var4; } } @@ -305,24 +305,24 @@ public class SequenceDefinition extends DualNode { garbageValue = "-386360993" ) @Export("animateSequence2") - public Model animateSequence2(Model var1, int var2, SequenceDefinition var3, int var4) { - var2 = this.frameIds[var2]; - Frames var5 = ItemContainer.getFrames(var2 >> 16); - var2 &= 65535; + public Model animateSequence2(Model model, int frame, SequenceDefinition sequence, int sequenceFrame) { + frame = this.frameIds[frame]; + Frames var5 = ItemContainer.getFrames(frame >> 16); + frame &= 65535; if (var5 == null) { - return var3.animateSequence(var1, var4); + return sequence.animateSequence(model, sequenceFrame); } else { - var4 = var3.frameIds[var4]; - Frames var6 = ItemContainer.getFrames(var4 >> 16); - var4 &= 65535; + sequenceFrame = sequence.frameIds[sequenceFrame]; + Frames var6 = ItemContainer.getFrames(sequenceFrame >> 16); + sequenceFrame &= 65535; Model var7; if (var6 == null) { - var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2)); - var7.animate(var5, var2); + var7 = model.toSharedSequenceModel(!var5.hasAlphaTransform(frame)); + var7.animate(var5, frame); return var7; } else { - var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4)); - var7.animate2(var5, var2, var6, var4, this.field777); + var7 = model.toSharedSequenceModel(!var5.hasAlphaTransform(frame) & !var6.hasAlphaTransform(sequenceFrame)); + var7.animate2(var5, frame, var6, sequenceFrame, this.field777); return var7; } } @@ -334,29 +334,29 @@ public class SequenceDefinition extends DualNode { garbageValue = "-15433768" ) @Export("animateWidget") - public Model animateWidget(Model var1, int var2) { - int var3 = this.frameIds[var2]; + public Model animateWidget(Model model, int frame) { + int var3 = this.frameIds[frame]; Frames var4 = ItemContainer.getFrames(var3 >> 16); var3 &= 65535; if (var4 == null) { - return var1.toSharedSequenceModel(true); + return model.toSharedSequenceModel(true); } else { Frames var5 = null; int var6 = 0; - if (this.frameIds2 != null && var2 < this.frameIds2.length) { - var6 = this.frameIds2[var2]; + if (this.frameIds2 != null && frame < this.frameIds2.length) { + var6 = this.frameIds2[frame]; var5 = ItemContainer.getFrames(var6 >> 16); var6 &= 65535; } Model var7; if (var5 != null && var6 != 65535) { - var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3) & !var5.hasAlphaTransform(var6)); + var7 = model.toSharedSequenceModel(!var4.hasAlphaTransform(var3) & !var5.hasAlphaTransform(var6)); var7.animate(var4, var3); var7.animate(var5, var6); return var7; } else { - var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3)); + var7 = model.toSharedSequenceModel(!var4.hasAlphaTransform(var3)); var7.animate(var4, var3); return var7; } diff --git a/runescape-client/src/main/java/ServerPacket.java b/runescape-client/src/main/java/ServerPacket.java index 175df49e43..68feb8a77e 100644 --- a/runescape-client/src/main/java/ServerPacket.java +++ b/runescape-client/src/main/java/ServerPacket.java @@ -477,7 +477,7 @@ public class ServerPacket { VarbitDefinition.indexedSpriteWidths = null; SecureRandomCallable.indexedSpriteHeights = null; class328.indexedSpritePalette = null; - class328.spritePixels = (byte[][])null; + class328.spritePixels = ((byte[][])null); return var0; } diff --git a/runescape-client/src/main/java/Skeleton.java b/runescape-client/src/main/java/Skeleton.java index 1f17947b6a..b13a804770 100644 --- a/runescape-client/src/main/java/Skeleton.java +++ b/runescape-client/src/main/java/Skeleton.java @@ -16,8 +16,8 @@ public class Skeleton extends Node { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache1") - static IndexCache indexCache1; + @Export("archive1") + static Archive archive1; @ObfuscatedName("m") @ObfuscatedGetter( intValue = -1634889691 diff --git a/runescape-client/src/main/java/Skills.java b/runescape-client/src/main/java/Skills.java index a35cc48a35..b5309806fc 100644 --- a/runescape-client/src/main/java/Skills.java +++ b/runescape-client/src/main/java/Skills.java @@ -26,24 +26,24 @@ public class Skills { if (var1 != null) { return var1; } else { - byte[] var2 = ItemDefinition.ItemDefinition_indexCache.takeRecord(10, var0); + byte[] var2 = ItemDefinition.ItemDefinition_archive.takeFile(10, var0); var1 = new ItemDefinition(); var1.id = var0; if (var2 != null) { - var1.read(new Buffer(var2)); + var1.decode(new Buffer(var2)); } var1.post(); if (var1.noteTemplate != -1) { - var1.method140(getItemDefinition(var1.noteTemplate), getItemDefinition(var1.note)); + var1.genCert(getItemDefinition(var1.noteTemplate), getItemDefinition(var1.note)); } if (var1.notedId != -1) { - var1.method141(getItemDefinition(var1.notedId), getItemDefinition(var1.unnotedId)); + var1.genBought(getItemDefinition(var1.notedId), getItemDefinition(var1.unnotedId)); } if (var1.placeholderTemplate != -1) { - var1.method142(getItemDefinition(var1.placeholderTemplate), getItemDefinition(var1.placeholder)); + var1.genPlaceholder(getItemDefinition(var1.placeholderTemplate), getItemDefinition(var1.placeholder)); } if (!class30.inMembersWorld && var1.isMembersOnly) { @@ -51,14 +51,14 @@ public class Skills { var1.isTradable = false; var1.groundActions = null; var1.inventoryActions = null; - var1.shiftClickIndex0 = -1; - var1.int1 = 0; + var1.shiftClickIndex = -1; + var1.team = 0; if (var1.params != null) { boolean var3 = false; for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { - ParamKeyDefinition var5 = class229.getParamKeyDefinition((int)var4.key); - if (var5.isMembersOnly) { + ParamDefinition var5 = class229.getParamDefinition((int)var4.key); + if (var5.autoDisable) { var4.remove(); } else { var3 = true; diff --git a/runescape-client/src/main/java/SoundCache.java b/runescape-client/src/main/java/SoundCache.java index 273e1d1d91..c529ad236a 100644 --- a/runescape-client/src/main/java/SoundCache.java +++ b/runescape-client/src/main/java/SoundCache.java @@ -18,13 +18,13 @@ public class SoundCache { signature = "Lir;" ) @Export("soundEffectIndex") - AbstractIndexCache soundEffectIndex; + AbstractArchive soundEffectIndex; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lir;" ) @Export("musicSampleIndex") - AbstractIndexCache musicSampleIndex; + AbstractArchive musicSampleIndex; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lld;" @@ -41,7 +41,7 @@ public class SoundCache { @ObfuscatedSignature( signature = "(Lir;Lir;)V" ) - public SoundCache(AbstractIndexCache var1, AbstractIndexCache var2) { + public SoundCache(AbstractArchive var1, AbstractArchive var2) { this.musicSamples = new NodeHashTable(256); this.rawSounds = new NodeHashTable(256); this.soundEffectIndex = var1; @@ -154,71 +154,71 @@ public class SoundCache { garbageValue = "-1706770105" ) @Export("encodeStringCp1252") - public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { - int var5 = var2 - var1; + public static int encodeStringCp1252(CharSequence src, int srcStart, int srcEnd, byte[] dst, int dstStart) { + int var5 = srcEnd - srcStart; for (int var6 = 0; var6 < var5; ++var6) { - char var7 = var0.charAt(var6 + var1); + char var7 = src.charAt(var6 + srcStart); if ((var7 <= 0 || var7 >= 128) && (var7 < 160 || var7 > 255)) { if (var7 == 8364) { - var3[var6 + var4] = -128; + dst[var6 + dstStart] = -128; } else if (var7 == 8218) { - var3[var6 + var4] = -126; + dst[var6 + dstStart] = -126; } else if (var7 == 402) { - var3[var6 + var4] = -125; + dst[var6 + dstStart] = -125; } else if (var7 == 8222) { - var3[var6 + var4] = -124; + dst[var6 + dstStart] = -124; } else if (var7 == 8230) { - var3[var6 + var4] = -123; + dst[var6 + dstStart] = -123; } else if (var7 == 8224) { - var3[var6 + var4] = -122; + dst[var6 + dstStart] = -122; } else if (var7 == 8225) { - var3[var6 + var4] = -121; + dst[var6 + dstStart] = -121; } else if (var7 == 710) { - var3[var6 + var4] = -120; + dst[var6 + dstStart] = -120; } else if (var7 == 8240) { - var3[var6 + var4] = -119; + dst[var6 + dstStart] = -119; } else if (var7 == 352) { - var3[var6 + var4] = -118; + dst[var6 + dstStart] = -118; } else if (var7 == 8249) { - var3[var6 + var4] = -117; + dst[var6 + dstStart] = -117; } else if (var7 == 338) { - var3[var6 + var4] = -116; + dst[var6 + dstStart] = -116; } else if (var7 == 381) { - var3[var6 + var4] = -114; + dst[var6 + dstStart] = -114; } else if (var7 == 8216) { - var3[var6 + var4] = -111; + dst[var6 + dstStart] = -111; } else if (var7 == 8217) { - var3[var6 + var4] = -110; + dst[var6 + dstStart] = -110; } else if (var7 == 8220) { - var3[var6 + var4] = -109; + dst[var6 + dstStart] = -109; } else if (var7 == 8221) { - var3[var6 + var4] = -108; + dst[var6 + dstStart] = -108; } else if (var7 == 8226) { - var3[var6 + var4] = -107; + dst[var6 + dstStart] = -107; } else if (var7 == 8211) { - var3[var6 + var4] = -106; + dst[var6 + dstStart] = -106; } else if (var7 == 8212) { - var3[var6 + var4] = -105; + dst[var6 + dstStart] = -105; } else if (var7 == 732) { - var3[var6 + var4] = -104; + dst[var6 + dstStart] = -104; } else if (var7 == 8482) { - var3[var6 + var4] = -103; + dst[var6 + dstStart] = -103; } else if (var7 == 353) { - var3[var6 + var4] = -102; + dst[var6 + dstStart] = -102; } else if (var7 == 8250) { - var3[var6 + var4] = -101; + dst[var6 + dstStart] = -101; } else if (var7 == 339) { - var3[var6 + var4] = -100; + dst[var6 + dstStart] = -100; } else if (var7 == 382) { - var3[var6 + var4] = -98; + dst[var6 + dstStart] = -98; } else if (var7 == 376) { - var3[var6 + var4] = -97; + dst[var6 + dstStart] = -97; } else { - var3[var6 + var4] = 63; + dst[var6 + dstStart] = 63; } } else { - var3[var6 + var4] = (byte)var7; + dst[var6 + dstStart] = (byte)var7; } } diff --git a/runescape-client/src/main/java/SoundEffect.java b/runescape-client/src/main/java/SoundEffect.java index 6226bf1571..29276a314d 100644 --- a/runescape-client/src/main/java/SoundEffect.java +++ b/runescape-client/src/main/java/SoundEffect.java @@ -66,8 +66,8 @@ public class SoundEffect { if (var1 != 9999999 && var1 != 0) { for (var2 = 0; var2 < 10; ++var2) { if (this.instruments[var2] != null) { - Instrument var10000 = this.instruments[var2]; - var10000.offset -= var1 * 20; + Instrument var3 = this.instruments[var2]; + var3.offset -= var1 * 20; } } @@ -126,8 +126,8 @@ public class SoundEffect { signature = "(Lir;II)Lci;" ) @Export("readSoundEffect") - public static SoundEffect readSoundEffect(AbstractIndexCache var0, int var1, int var2) { - byte[] var3 = var0.takeRecord(var1, var2); + public static SoundEffect readSoundEffect(AbstractArchive var0, int var1, int var2) { + byte[] var3 = var0.takeFile(var1, var2); return var3 == null ? null : new SoundEffect(new Buffer(var3)); } } diff --git a/runescape-client/src/main/java/SoundEnvelope.java b/runescape-client/src/main/java/SoundEnvelope.java index dcbf6c0597..114aa68414 100644 --- a/runescape-client/src/main/java/SoundEnvelope.java +++ b/runescape-client/src/main/java/SoundEnvelope.java @@ -55,11 +55,11 @@ public class SoundEnvelope { signature = "(Lgr;)V" ) @Export("decode") - final void decode(Buffer var1) { - this.form = var1.readUnsignedByte(); - this.start = var1.readInt(); - this.end = var1.readInt(); - this.decodeSegments(var1); + final void decode(Buffer buffer) { + this.form = buffer.readUnsignedByte(); + this.start = buffer.readInt(); + this.end = buffer.readInt(); + this.decodeSegments(buffer); } @ObfuscatedName("f") @@ -67,14 +67,14 @@ public class SoundEnvelope { signature = "(Lgr;)V" ) @Export("decodeSegments") - final void decodeSegments(Buffer var1) { - this.segments = var1.readUnsignedByte(); + final void decodeSegments(Buffer buffer) { + this.segments = buffer.readUnsignedByte(); this.durations = new int[this.segments]; this.phases = new int[this.segments]; for (int var2 = 0; var2 < this.segments; ++var2) { - this.durations[var2] = var1.readUnsignedShort(); - this.phases[var2] = var1.readUnsignedShort(); + this.durations[var2] = buffer.readUnsignedShort(); + this.phases[var2] = buffer.readUnsignedShort(); } } diff --git a/runescape-client/src/main/java/SoundSystem.java b/runescape-client/src/main/java/SoundSystem.java index e80bd0db1f..38b8eeb3f6 100644 --- a/runescape-client/src/main/java/SoundSystem.java +++ b/runescape-client/src/main/java/SoundSystem.java @@ -24,8 +24,6 @@ public class SoundSystem implements Runnable { this.players = new PcmPlayer[2]; } - @Export("run") - @ObfuscatedName("run") public void run() { try { for (int var1 = 0; var1 < 2; ++var1) { @@ -50,7 +48,7 @@ public class SoundSystem implements Runnable { if (var1 != null) { return var1; } else { - byte[] var2 = Formatting.indexCache12.takeRecord(var0, 0); + byte[] var2 = Formatting.archive12.takeFile(var0, 0); if (var2 == null) { return null; } else { diff --git a/runescape-client/src/main/java/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java index b9d3951b01..3d7668daf8 100644 --- a/runescape-client/src/main/java/SpotAnimationDefinition.java +++ b/runescape-client/src/main/java/SpotAnimationDefinition.java @@ -11,14 +11,14 @@ public class SpotAnimationDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("SpotAnimationDefinition_indexCache") - public static AbstractIndexCache SpotAnimationDefinition_indexCache; + @Export("SpotAnimationDefinition_archive") + public static AbstractArchive SpotAnimationDefinition_archive; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lir;" ) - @Export("SpotAnimationDefinition_modelIndexCache") - public static AbstractIndexCache SpotAnimationDefinition_modelIndexCache; + @Export("SpotAnimationDefinition_modelArchive") + public static AbstractArchive SpotAnimationDefinition_modelArchive; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Ler;" @@ -104,15 +104,15 @@ public class SpotAnimationDefinition extends DualNode { signature = "(Lgr;I)V", garbageValue = "906815828" ) - @Export("read") - void read(Buffer var1) { + @Export("decode") + void decode(Buffer buffer) { while (true) { - int var2 = var1.readUnsignedByte(); + int var2 = buffer.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(buffer, var2); } } @@ -121,42 +121,42 @@ public class SpotAnimationDefinition extends DualNode { signature = "(Lgr;II)V", garbageValue = "2099681848" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer buffer, int var2) { if (var2 == 1) { - this.archive = var1.readUnsignedShort(); + this.archive = buffer.readUnsignedShort(); } else if (var2 == 2) { - this.sequence = var1.readUnsignedShort(); + this.sequence = buffer.readUnsignedShort(); } else if (var2 == 4) { - this.widthScale = var1.readUnsignedShort(); + this.widthScale = buffer.readUnsignedShort(); } else if (var2 == 5) { - this.heightScale = var1.readUnsignedShort(); + this.heightScale = buffer.readUnsignedShort(); } else if (var2 == 6) { - this.orientation = var1.readUnsignedShort(); + this.orientation = buffer.readUnsignedShort(); } else if (var2 == 7) { - this.field876 = var1.readUnsignedByte(); + this.field876 = buffer.readUnsignedByte(); } else if (var2 == 8) { - this.field877 = var1.readUnsignedByte(); + this.field877 = buffer.readUnsignedByte(); } else { int var3; int var4; if (var2 == 40) { - var3 = var1.readUnsignedByte(); + var3 = buffer.readUnsignedByte(); this.recolorFrom = new short[var3]; this.recolorTo = new short[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.recolorFrom[var4] = (short)var1.readUnsignedShort(); - this.recolorTo[var4] = (short)var1.readUnsignedShort(); + this.recolorFrom[var4] = (short)buffer.readUnsignedShort(); + this.recolorTo[var4] = (short)buffer.readUnsignedShort(); } } else if (var2 == 41) { - var3 = var1.readUnsignedByte(); + var3 = buffer.readUnsignedByte(); this.retextureFrom = new short[var3]; this.retextureTo = new short[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.retextureFrom[var4] = (short)var1.readUnsignedShort(); - this.retextureTo[var4] = (short)var1.readUnsignedShort(); + this.retextureFrom[var4] = (short)buffer.readUnsignedShort(); + this.retextureTo[var4] = (short)buffer.readUnsignedShort(); } } } @@ -172,7 +172,7 @@ public class SpotAnimationDefinition extends DualNode { public final Model getModel(int var1) { Model var2 = (Model)SpotAnimationDefinition_cachedModels.get((long)this.id); if (var2 == null) { - ModelData var3 = ModelData.method2788(SpotAnimationDefinition_modelIndexCache, this.archive, 0); + ModelData var3 = ModelData.method2788(SpotAnimationDefinition_modelArchive, this.archive, 0); if (var3 == null) { return null; } @@ -230,7 +230,8 @@ public class SpotAnimationDefinition extends DualNode { signature = "(B)I", garbageValue = "95" ) - static int method4822() { + @Export("getWindowedMode") + static int getWindowedMode() { return Client.isResizable ? 2 : 1; } diff --git a/runescape-client/src/main/java/Sprite.java b/runescape-client/src/main/java/Sprite.java index 58538a0d46..81b909b331 100644 --- a/runescape-client/src/main/java/Sprite.java +++ b/runescape-client/src/main/java/Sprite.java @@ -666,44 +666,45 @@ public final class Sprite extends Rasterizer2D { int var9 = var2 < 0 ? -var2 : 0; int var10 = var2 + this.subHeight <= var6 ? this.subHeight : var6 - var2; int var11 = var1 < 0 ? -var1 : 0; + int var12; if (this.subWidth + var1 <= var5) { - int var12 = this.subWidth; + var12 = this.subWidth; } else { int var10000 = var5 - var1; } - int var13 = var3 + var11 + (var9 + var2 + var4) * Rasterizer2D.Rasterizer2D_width + var1; - int var14 = var9 + var2; + var12 = var3 + var11 + (var9 + var2 + var4) * Rasterizer2D.Rasterizer2D_width + var1; + int var13 = var9 + var2; + + for (int var14 = var9; var14 < var10; ++var14) { + int var15 = var7[var13]; + int var16 = var8[var13++]; + int var17 = var12; + int var18; + if (var1 < var15) { + var18 = var15 - var1; + var17 = var12 + (var18 - var11); + } else { + var18 = var11; + } - for (int var15 = var9; var15 < var10; ++var15) { - int var16 = var7[var14]; - int var17 = var8[var14++]; - int var18 = var13; int var19; - if (var1 < var16) { - var19 = var16 - var1; - var18 = var13 + (var19 - var11); + if (this.subWidth + var1 <= var15 + var16) { + var19 = this.subWidth; } else { - var19 = var11; + var19 = var15 + var16 - var1; } - int var20; - if (this.subWidth + var1 <= var16 + var17) { - var20 = this.subWidth; - } else { - var20 = var16 + var17 - var1; - } - - for (int var21 = var19; var21 < var20; ++var21) { - int var22 = this.pixels[var21 + var15 * this.subWidth]; - if (var22 != 0) { - Rasterizer2D.Rasterizer2D_pixels[var18++] = var22; + for (int var20 = var18; var20 < var19; ++var20) { + int var21 = this.pixels[var20 + var14 * this.subWidth]; + if (var21 != 0) { + Rasterizer2D.Rasterizer2D_pixels[var17++] = var21; } else { - ++var18; + ++var17; } } - var13 += Rasterizer2D.Rasterizer2D_width; + var12 += Rasterizer2D.Rasterizer2D_width; } } diff --git a/runescape-client/src/main/java/SpriteMask.java b/runescape-client/src/main/java/SpriteMask.java index e14649895e..c248aeaada 100644 --- a/runescape-client/src/main/java/SpriteMask.java +++ b/runescape-client/src/main/java/SpriteMask.java @@ -39,10 +39,10 @@ public class SpriteMask extends DualNode { garbageValue = "781236044" ) @Export("contains") - public boolean contains(int var1, int var2) { - if (var2 >= 0 && var2 < this.xStarts.length) { - int var3 = this.xStarts[var2]; - if (var1 >= var3 && var1 <= var3 + this.xWidths[var2]) { + public boolean contains(int x, int y) { + if (y >= 0 && y < this.xStarts.length) { + int var3 = this.xStarts[y]; + if (x >= var3 && x <= var3 + this.xWidths[y]) { return true; } } @@ -96,8 +96,8 @@ public class SpriteMask extends DualNode { garbageValue = "1" ) @Export("loadSprite") - public static boolean loadSprite(AbstractIndexCache var0, int var1, int var2) { - byte[] var3 = var0.takeRecord(var1, var2); + public static boolean loadSprite(AbstractArchive var0, int var1, int var2) { + byte[] var3 = var0.takeFile(var1, var2); if (var3 == null) { return false; } else { diff --git a/runescape-client/src/main/java/Strings.java b/runescape-client/src/main/java/Strings.java index 07e4155771..7e7903bafb 100644 --- a/runescape-client/src/main/java/Strings.java +++ b/runescape-client/src/main/java/Strings.java @@ -27,28 +27,26 @@ public class Strings { Buffer var1 = new Buffer(var0); int var2 = var1.readUnsignedByte(); int var3 = var1.readInt(); - if (var3 >= 0 && (AbstractIndexCache.field1 == 0 || var3 <= AbstractIndexCache.field1)) { - if (var2 == 0) { - byte[] var6 = new byte[var3]; - var1.method46(var6, 0, var3); - return var6; - } else { - int var4 = var1.readInt(); - if (var4 < 0 || AbstractIndexCache.field1 != 0 && var4 > AbstractIndexCache.field1) { - throw new RuntimeException(); - } else { - byte[] var5 = new byte[var4]; - if (var2 == 1) { - Bzip2Decompressor.Bzip2Decompressor_decompress(var5, var4, var0, var3, 9); - } else { - AbstractIndexCache.gzipDecompressor.decompress(var1, var5); - } - - return var5; - } - } - } else { + if (var3 < 0 || AbstractArchive.field1 != 0 && var3 > AbstractArchive.field1) { throw new RuntimeException(); + } else if (var2 == 0) { + byte[] var6 = new byte[var3]; + var1.method46(var6, 0, var3); + return var6; + } else { + int var4 = var1.readInt(); + if (var4 < 0 || AbstractArchive.field1 != 0 && var4 > AbstractArchive.field1) { + throw new RuntimeException(); + } else { + byte[] var5 = new byte[var4]; + if (var2 == 1) { + Bzip2Decompressor.Bzip2Decompressor_decompress(var5, var4, var0, var3, 9); + } else { + AbstractArchive.gzipDecompressor.decompress(var1, var5); + } + + return var5; + } } } diff --git a/runescape-client/src/main/java/StructDefinition.java b/runescape-client/src/main/java/StructDefinition.java index 6a9c2c932f..7fcc7dcf5e 100644 --- a/runescape-client/src/main/java/StructDefinition.java +++ b/runescape-client/src/main/java/StructDefinition.java @@ -2,6 +2,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("jq") @Implements("StructDefinition") @@ -10,12 +11,14 @@ public class StructDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field885; + @Export("StructDefinition_archive") + public static AbstractArchive StructDefinition_archive; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Ler;" ) - public static EvictingDualNodeHashTable field886; + @Export("StructDefinition_cached") + public static EvictingDualNodeHashTable StructDefinition_cached; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Llh;" @@ -28,8 +31,8 @@ public class StructDefinition extends DualNode { signature = "(B)V", garbageValue = "-16" ) - @Export("init") - void init() { + @Export("postDecode") + void postDecode() { } @ObfuscatedName("q") @@ -37,15 +40,15 @@ public class StructDefinition extends DualNode { signature = "(Lgr;I)V", garbageValue = "853330780" ) - @Export("read") - void read(Buffer var1) { + @Export("decode") + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -54,10 +57,10 @@ public class StructDefinition extends DualNode { signature = "(Lgr;II)V", garbageValue = "-2035893488" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { if (var2 == 249) { - this.params = AbstractIndexCache.readStringIntParameters(var1, this.params); + this.params = AbstractArchive.readStringIntParameters(var1, this.params); } } @@ -108,10 +111,10 @@ public class StructDefinition extends DualNode { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var4 = Huffman.getWidget(var3); } else { - var4 = var2 ? WorldMapIcon1.field1030 : class12.field1111; + var4 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111; } - if (var0 == 1100) { + if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { RouteStrategy.Interpreter_intStackSize -= 2; var4.scrollX = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; if (var4.scrollX > var4.scrollWidth - var4.width) { @@ -133,40 +136,40 @@ public class StructDefinition extends DualNode { class22.method295(var4); return 1; - } else if (var0 == 1101) { + } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { var4.color = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; class22.method295(var4); return 1; - } else if (var0 == 1102) { + } else if (var0 == ScriptOpcodes.CC_SETFILL) { var4.fill = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; class22.method295(var4); return 1; - } else if (var0 == 1103) { + } else if (var0 == ScriptOpcodes.CC_SETTRANS) { var4.transparency = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; class22.method295(var4); return 1; - } else if (var0 == 1104) { + } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { var4.lineWid = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; class22.method295(var4); return 1; - } else if (var0 == 1105) { + } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { var4.spriteId2 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; class22.method295(var4); return 1; - } else if (var0 == 1106) { + } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { var4.spriteAngle = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; class22.method295(var4); return 1; - } else if (var0 == 1107) { + } else if (var0 == ScriptOpcodes.CC_SETTILING) { var4.spriteTiling = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; class22.method295(var4); return 1; - } else if (var0 == 1108) { + } else if (var0 == ScriptOpcodes.CC_SETMODEL) { var4.modelType = 1; var4.modelId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; class22.method295(var4); return 1; - } else if (var0 == 1109) { + } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { RouteStrategy.Interpreter_intStackSize -= 6; var4.modelOffsetX = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4.modelOffsetY = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; @@ -178,7 +181,7 @@ public class StructDefinition extends DualNode { return 1; } else { int var5; - if (var0 == 1110) { + if (var0 == ScriptOpcodes.CC_SETMODELANIM) { var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if (var5 != var4.sequenceId) { var4.sequenceId = var5; @@ -188,11 +191,11 @@ public class StructDefinition extends DualNode { } return 1; - } else if (var0 == 1111) { + } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { var4.modelOrthog = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; class22.method295(var4); return 1; - } else if (var0 == 1112) { + } else if (var0 == ScriptOpcodes.CC_SETTEXT) { String var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; if (!var8.equals(var4.text)) { var4.text = var8; @@ -200,48 +203,48 @@ public class StructDefinition extends DualNode { } return 1; - } else if (var0 == 1113) { + } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { var4.fontId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; class22.method295(var4); return 1; - } else if (var0 == 1114) { + } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { RouteStrategy.Interpreter_intStackSize -= 3; var4.textXAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4.textYAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; var4.textLineHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; class22.method295(var4); return 1; - } else if (var0 == 1115) { + } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { var4.textShadowed = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; class22.method295(var4); return 1; - } else if (var0 == 1116) { + } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { var4.outline = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; class22.method295(var4); return 1; - } else if (var0 == 1117) { + } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { var4.spriteShadow = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; class22.method295(var4); return 1; - } else if (var0 == 1118) { + } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { var4.spriteFlipV = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; class22.method295(var4); return 1; - } else if (var0 == 1119) { + } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { var4.spriteFlipH = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; class22.method295(var4); return 1; - } else if (var0 == 1120) { + } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { RouteStrategy.Interpreter_intStackSize -= 2; var4.scrollWidth = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4.scrollHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; class22.method295(var4); if (var3 != -1 && var4.type == 0) { - class39.revalidateWidgetScroll(Widget.widgets[var3 >> 16], var4, false); + class39.revalidateWidgetScroll(Widget.interfaceComponents[var3 >> 16], var4, false); } return 1; - } else if (var0 == 1121) { + } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { TilePaint.method3060(var4.id, var4.childIndex); Client.field127 = var4; class22.method295(var4); @@ -250,7 +253,7 @@ public class StructDefinition extends DualNode { var4.spriteId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; class22.method295(var4); return 1; - } else if (var0 == 1123) { + } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { var4.color2 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; class22.method295(var4); return 1; @@ -260,7 +263,7 @@ public class StructDefinition extends DualNode { return 1; } else if (var0 == 1125) { var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - RectangleMode var7 = (RectangleMode)ScriptFrame.findEnumerated(class311.method5822(), var5); + RectangleMode var7 = (RectangleMode)ScriptFrame.findEnumerated(DefaultsGroup.method5822(), var5); if (var7 != null) { var4.rectangleMode = var7; class22.method295(var4); @@ -269,13 +272,13 @@ public class StructDefinition extends DualNode { return 1; } else { boolean var6; - if (var0 == 1126) { + if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { var6 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; var4.field961 = var6; return 1; } else if (var0 == 1127) { var6 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - var4.field964 = var6; + var4.modelTransparency = var6; return 1; } else { return 2; @@ -285,6 +288,6 @@ public class StructDefinition extends DualNode { } static { - field886 = new EvictingDualNodeHashTable(64); + StructDefinition_cached = new EvictingDualNodeHashTable(64); } } diff --git a/runescape-client/src/main/java/StudioGame.java b/runescape-client/src/main/java/StudioGame.java index 8a6694afac..87f2f9d2b5 100644 --- a/runescape-client/src/main/java/StudioGame.java +++ b/runescape-client/src/main/java/StudioGame.java @@ -68,19 +68,19 @@ public enum StudioGame implements Enumerated { signature = "(II)Lih;", garbageValue = "-2058685786" ) - public static UnderlayDefinition method4550(int var0) { - UnderlayDefinition var1 = (UnderlayDefinition)UnderlayDefinition.UnderlayDefinition_cached.get((long)var0); + public static FloorUnderlayDefinition method4550(int var0) { + FloorUnderlayDefinition var1 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var0); if (var1 != null) { return var1; } else { - byte[] var2 = UnderlayDefinition.UnderlayDefinition_indexCache.takeRecord(1, var0); - var1 = new UnderlayDefinition(); + byte[] var2 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var0); + var1 = new FloorUnderlayDefinition(); if (var2 != null) { - var1.read(new Buffer(var2), var0); + var1.decode(new Buffer(var2), var0); } - var1.init(); - UnderlayDefinition.UnderlayDefinition_cached.put(var1, (long)var0); + var1.postDecode(); + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0); return var1; } } diff --git a/runescape-client/src/main/java/TaskHandler.java b/runescape-client/src/main/java/TaskHandler.java index 5a6c3f2bf9..ebebc5f6dd 100644 --- a/runescape-client/src/main/java/TaskHandler.java +++ b/runescape-client/src/main/java/TaskHandler.java @@ -124,8 +124,6 @@ public class TaskHandler implements Runnable { return this.newTask(2, var2, 0, var1); } - @Export("run") - @ObfuscatedName("run") public final void run() { while (true) { Task var1; diff --git a/runescape-client/src/main/java/Texture.java b/runescape-client/src/main/java/Texture.java index ce5b8d8384..99c20b1185 100644 --- a/runescape-client/src/main/java/Texture.java +++ b/runescape-client/src/main/java/Texture.java @@ -86,10 +86,10 @@ public class Texture extends Node { @ObfuscatedSignature( signature = "(DILir;)Z" ) - boolean method320(double var1, int var3, AbstractIndexCache var4) { + boolean method320(double var1, int var3, AbstractArchive var4) { int var5; for (var5 = 0; var5 < this.records.length; ++var5) { - if (var4.getRecordFlat(this.records[var5]) == null) { + if (var4.getFileFlat(this.records[var5]) == null) { return false; } } @@ -184,8 +184,8 @@ public class Texture extends Node { } @ObfuscatedName("q") - @Export("Texture_animate") - void Texture_animate(int var1) { + @Export("animate") + void animate(int var1) { if (this.pixels != null) { short var2; int var3; diff --git a/runescape-client/src/main/java/TextureProvider.java b/runescape-client/src/main/java/TextureProvider.java index 347ad0ba62..c40719ff15 100644 --- a/runescape-client/src/main/java/TextureProvider.java +++ b/runescape-client/src/main/java/TextureProvider.java @@ -3,6 +3,7 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("dl") @Implements("TextureProvider") @@ -50,18 +51,18 @@ public class TextureProvider implements TextureLoader { @ObfuscatedSignature( signature = "Lir;" ) - @Export("indexCache") - AbstractIndexCache indexCache; + @Export("archive") + AbstractArchive archive; @ObfuscatedSignature( signature = "(Lir;Lir;IDI)V" ) - public TextureProvider(AbstractIndexCache var1, AbstractIndexCache var2, int var3, double var4, int var6) { + public TextureProvider(AbstractArchive var1, AbstractArchive var2, int var3, double var4, int var6) { this.deque = new NodeDeque(); this.remaining = 0; this.brightness0 = 1.0D; this.textureSize = 128; - this.indexCache = var2; + this.archive = var2; this.capacity = var3; this.remaining = this.capacity; this.brightness0 = var4; @@ -71,7 +72,7 @@ public class TextureProvider implements TextureLoader { this.textures = new Texture[var1.method4(0)]; for (int var9 = 0; var9 < var8; ++var9) { - Buffer var10 = new Buffer(var1.takeRecord(0, var7[var9])); + Buffer var10 = new Buffer(var1.takeFile(0, var7[var9])); this.textures[var7[var9]] = new Texture(var10); } @@ -95,7 +96,7 @@ public class TextureProvider implements TextureLoader { for (int var7 = 0; var7 < var6.length; ++var7) { int var8 = var6[var7]; - if (this.indexCache.method1(var8)) { + if (this.archive.method1(var8)) { ++var2; } } @@ -111,8 +112,8 @@ public class TextureProvider implements TextureLoader { @ObfuscatedName("f") @Export("setBrightness") - public void setBrightness(double var1) { - this.brightness0 = var1; + public void setBrightness(double brightness) { + this.brightness0 = brightness; this.clear(); } @@ -131,7 +132,7 @@ public class TextureProvider implements TextureLoader { return var2.pixels; } - boolean var3 = var2.method320(this.brightness0, this.textureSize, this.indexCache); + boolean var3 = var2.method320(this.brightness0, this.textureSize, this.archive); if (var3) { if (this.remaining == 0) { Texture var4 = (Texture)this.deque.removeFirst(); @@ -204,7 +205,7 @@ public class TextureProvider implements TextureLoader { for (int var2 = 0; var2 < this.textures.length; ++var2) { Texture var3 = this.textures[var2]; if (var3 != null && var3.animationDirection != 0 && var3.isLoaded) { - var3.Texture_animate(var1); + var3.animate(var1); var3.isLoaded = false; } } @@ -230,12 +231,12 @@ public class TextureProvider implements TextureLoader { garbageValue = "-8" ) @Export("byteArrayFromObject") - public static byte[] byteArrayFromObject(Object var0, boolean var1) { + public static byte[] byteArrayFromObject(Object var0, boolean copyArray) { if (var0 == null) { return null; } else if (var0 instanceof byte[]) { - byte[] var5 = (byte[])((byte[])((byte[])var0)); - if (var1) { + byte[] var5 = ((byte[])var0); + if (copyArray) { int var3 = var5.length; byte[] var4 = new byte[var3]; System.arraycopy(var5, 0, var4, 0, var3); @@ -261,7 +262,7 @@ public class TextureProvider implements TextureLoader { Buffer var4 = new Buffer(var0); int var5 = -1; - label71: + label56: while (true) { int var6 = var4.method49(); if (var6 == 0) { @@ -273,50 +274,38 @@ public class TextureProvider implements TextureLoader { boolean var8 = false; while (true) { - int var12; - ObjectDefinition var15; - do { - int var13; - int var14; - do { - do { - do { - do { - int var9; - while (var8) { - var9 = var4.method48(); - if (var9 == 0) { - continue label71; - } + int var13; + while (!var8) { + var13 = var4.method48(); + if (var13 == 0) { + continue label56; + } - var4.readUnsignedByte(); - } + var7 += var13 - 1; + int var14 = var7 & 63; + int var15 = var7 >> 6 & 63; + int var9 = var4.readUnsignedByte() >> 2; + int var11 = var15 + var1; + int var12 = var14 + var2; + if (var11 > 0 && var12 > 0 && var11 < 103 && var12 < 103) { + ObjectDefinition var10 = class50.getObjectDefinition(var5); + if (var9 != 22 || !Client.isLowDetail || var10.int1 != 0 || var10.interactType == 1 || var10.boolean2) { + if (!var10.method231()) { + ++Client.field179; + var3 = false; + } - var9 = var4.method48(); - if (var9 == 0) { - continue label71; - } - - var7 += var9 - 1; - int var10 = var7 & 63; - int var11 = var7 >> 6 & 63; - var12 = var4.readUnsignedByte() >> 2; - var13 = var11 + var1; - var14 = var10 + var2; - } while(var13 <= 0); - } while(var14 <= 0); - } while(var13 >= 103); - } while(var14 >= 103); - - var15 = class50.getObjectDefinition(var5); - } while(var12 == 22 && Client.isLowDetail && var15.int1 == 0 && var15.interactType != 1 && !var15.boolean2); - - if (!var15.method231()) { - ++Client.field179; - var3 = false; + var8 = true; + } + } } - var8 = true; + var13 = var4.method48(); + if (var13 == 0) { + break; + } + + var4.readUnsignedByte(); } } } @@ -329,39 +318,39 @@ public class TextureProvider implements TextureLoader { static int method2752(int var0, Script var1, boolean var2) { int var3; int var4; - if (var0 == 4000) { + if (var0 == ScriptOpcodes.ADD) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 + var4; return 1; - } else if (var0 == 4001) { + } else if (var0 == ScriptOpcodes.SUB) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 - var4; return 1; - } else if (var0 == 4002) { + } else if (var0 == ScriptOpcodes.MULTIPLY) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4 * var3; return 1; - } else if (var0 == 4003) { + } else if (var0 == ScriptOpcodes.DIV) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 / var4; return 1; - } else if (var0 == 4004) { + } else if (var0 == ScriptOpcodes.RANDOM) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); return 1; - } else if (var0 == 4005) { + } else if (var0 == ScriptOpcodes.RANDOMINC) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); return 1; - } else if (var0 == 4006) { + } else if (var0 == ScriptOpcodes.INTERPOLATE) { RouteStrategy.Interpreter_intStackSize -= 5; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; @@ -370,37 +359,37 @@ public class TextureProvider implements TextureLoader { int var12 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 4]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 + (var12 - var11) * (var4 - var3) / (var6 - var11); return 1; - } else if (var0 == 4007) { + } else if (var0 == ScriptOpcodes.ADDPERCENT) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 + var3 * var4 / 100; return 1; - } else if (var0 == 4008) { + } else if (var0 == ScriptOpcodes.SETBIT) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 | 1 << var4; return 1; - } else if (var0 == 4009) { + } else if (var0 == ScriptOpcodes.CLEARBIT) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); return 1; - } else if (var0 == 4010) { + } else if (var0 == ScriptOpcodes.TESTBIT) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; return 1; - } else if (var0 == 4011) { + } else if (var0 == ScriptOpcodes.MOD) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 % var4; return 1; - } else if (var0 == 4012) { + } else if (var0 == ScriptOpcodes.POW) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; @@ -411,7 +400,7 @@ public class TextureProvider implements TextureLoader { } return 1; - } else if (var0 == 4013) { + } else if (var0 == ScriptOpcodes.INVPOW) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; @@ -441,19 +430,19 @@ public class TextureProvider implements TextureLoader { return 1; } - } else if (var0 == 4014) { + } else if (var0 == ScriptOpcodes.AND) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 & var4; return 1; - } else if (var0 == 4015) { + } else if (var0 == ScriptOpcodes.OR) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 | var4; return 1; - } else if (var0 == 4018) { + } else if (var0 == ScriptOpcodes.SCALE) { RouteStrategy.Interpreter_intStackSize -= 3; long var5 = (long)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; long var7 = (long)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; diff --git a/runescape-client/src/main/java/Tile.java b/runescape-client/src/main/java/Tile.java index 679acac7ce..753d7eb522 100644 --- a/runescape-client/src/main/java/Tile.java +++ b/runescape-client/src/main/java/Tile.java @@ -146,7 +146,7 @@ public final class Tile extends Node { garbageValue = "-1899580455" ) public static void method2867() { - UnderlayDefinition.UnderlayDefinition_cached.clear(); + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); } @ObfuscatedName("is") @@ -155,19 +155,19 @@ public final class Tile extends Node { garbageValue = "117" ) @Export("addNpcToMenu") - static final void addNpcToMenu(NPCDefinition var0, int var1, int var2, int var3) { + static final void addNpcToMenu(NPCDefinition npc, int menuArg0, int menuArg1, int menuArg2) { if (Client.menuOptionsCount < 400) { - if (var0.transforms != null) { - var0 = var0.transform(); + if (npc.transforms != null) { + npc = npc.transform(); } - if (var0 != null && var0.isInteractable && (!var0.isFollower || Client.followerIndex == var1)) { - String var4 = var0.name; + if (npc != null && npc.isInteractable && (!npc.isFollower || Client.followerIndex == menuArg0)) { + String var4 = npc.name; int var5; int var6; int var7; - if (var0.combatLevel != 0) { - var5 = var0.combatLevel; + if (npc.combatLevel != 0) { + var5 = npc.combatLevel; var6 = Canvas.localPlayer.combatLevel; var7 = var6 - var5; String var8; @@ -191,22 +191,22 @@ public final class Tile extends Node { var8 = BufferedFile.colorStartTag(16776960); } - var4 = var4 + var8 + " (level-" + var0.combatLevel + ")"; + var4 = var4 + var8 + " (level-" + npc.combatLevel + ")"; } - if (var0.isFollower && Client.followerOpsLowPriority) { - Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(16776960) + var4, 1003, var1, var2, var3); + if (npc.isFollower && Client.followerOpsLowPriority) { + Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(16776960) + var4, 1003, menuArg0, menuArg1, menuArg2); } if (Client.isItemSelected == 1) { - Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(16776960) + var4, 7, var1, var2, var3); + Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(16776960) + var4, 7, menuArg0, menuArg1, menuArg2); } else if (Client.isSpellSelected) { if ((FloorDecoration.selectedSpellFlags & 2) == 2) { - Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(16776960) + var4, 8, var1, var2, var3); + Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(16776960) + var4, 8, menuArg0, menuArg1, menuArg2); } } else { - var7 = var0.isFollower && Client.followerOpsLowPriority ? 2000 : 0; - String[] var10 = var0.actions; + var7 = npc.isFollower && Client.followerOpsLowPriority ? 2000 : 0; + String[] var10 = npc.actions; if (var10 != null) { for (var5 = 4; var5 >= 0; --var5) { if (var10[var5] != null && !var10[var5].equalsIgnoreCase("Attack")) { @@ -231,7 +231,7 @@ public final class Tile extends Node { var6 = var7 + 13; } - Tiles.insertMenuItemNoShift(var10[var5], BufferedFile.colorStartTag(16776960) + var4, var6, var1, var2, var3); + Tiles.insertMenuItemNoShift(var10[var5], BufferedFile.colorStartTag(16776960) + var4, var6, menuArg0, menuArg1, menuArg2); } } } @@ -241,7 +241,7 @@ public final class Tile extends Node { if (var10[var5] != null && var10[var5].equalsIgnoreCase("Attack")) { short var9 = 0; if (AttackOption.AttackOption_hidden != Client.npcAttackOption) { - if (AttackOption.AttackOption_alwaysRightClick == Client.npcAttackOption || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > Canvas.localPlayer.combatLevel) { + if (AttackOption.AttackOption_alwaysRightClick == Client.npcAttackOption || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && npc.combatLevel > Canvas.localPlayer.combatLevel) { var9 = 2000; } @@ -266,14 +266,14 @@ public final class Tile extends Node { var6 = var9 + 13; } - Tiles.insertMenuItemNoShift(var10[var5], BufferedFile.colorStartTag(16776960) + var4, var6, var1, var2, var3); + Tiles.insertMenuItemNoShift(var10[var5], BufferedFile.colorStartTag(16776960) + var4, var6, menuArg0, menuArg1, menuArg2); } } } } - if (!var0.isFollower || !Client.followerOpsLowPriority) { - Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(16776960) + var4, 1003, var1, var2, var3); + if (!npc.isFollower || !Client.followerOpsLowPriority) { + Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(16776960) + var4, 1003, menuArg0, menuArg1, menuArg2); } } } diff --git a/runescape-client/src/main/java/TilePaint.java b/runescape-client/src/main/java/TilePaint.java index 2f21f70ab0..586e34d0eb 100644 --- a/runescape-client/src/main/java/TilePaint.java +++ b/runescape-client/src/main/java/TilePaint.java @@ -74,8 +74,8 @@ public final class TilePaint { if (var2 == null) { class65.scene.removeGroundItemPile(SoundSystem.plane, var0, var1); } else { - long highestValue = -99999999L; - GroundItem highestValuedItem = null; + long var3 = -99999999L; + GroundItem var5 = null; GroundItem var6; for (var6 = (GroundItem)var2.last(); var6 != null; var6 = (GroundItem)var2.previous()) { @@ -85,21 +85,21 @@ public final class TilePaint { var8 *= (long)(var6.quantity + 1); } - if (var8 > highestValue) { - highestValue = var8; - highestValuedItem = var6; + if (var8 > var3) { + var3 = var8; + var5 = var6; } } - if (highestValuedItem == null) { + if (var5 == null) { class65.scene.removeGroundItemPile(SoundSystem.plane, var0, var1); } else { - var2.addLast(highestValuedItem); + var2.addLast(var5); GroundItem var11 = null; GroundItem var12 = null; for (var6 = (GroundItem)var2.last(); var6 != null; var6 = (GroundItem)var2.previous()) { - if (highestValuedItem.id != var6.id) { + if (var5.id != var6.id) { if (var11 == null) { var11 = var6; } @@ -111,7 +111,7 @@ public final class TilePaint { } long var9 = FontName.calculateTag(var0, var1, 3, false, 0); - class65.scene.newGroundItemPile(SoundSystem.plane, var0, var1, class32.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, SoundSystem.plane), highestValuedItem, var9, var11, var12); + class65.scene.newGroundItemPile(SoundSystem.plane, var0, var1, class32.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, SoundSystem.plane), var5, var9, var11, var12); } } diff --git a/runescape-client/src/main/java/Timer.java b/runescape-client/src/main/java/Timer.java index e2bd0099ce..e1e8b9bb6b 100644 --- a/runescape-client/src/main/java/Timer.java +++ b/runescape-client/src/main/java/Timer.java @@ -140,7 +140,7 @@ public class Timer { garbageValue = "805398419" ) @Export("write") - public void write(Buffer var1) { + public void write(Buffer buffer) { long var2 = this.field923; var2 /= 10L; if (var2 < 0L) { @@ -149,7 +149,7 @@ public class Timer { var2 = 65535L; } - var1.writeShort((int)var2); + buffer.writeShort((int)var2); long var4 = this.field922; var4 /= 10L; if (var4 < 0L) { @@ -158,7 +158,7 @@ public class Timer { var4 = 65535L; } - var1.writeShort((int)var4); + buffer.writeShort((int)var4); long var6 = this.field924; var6 /= 10L; if (var6 < 0L) { @@ -167,10 +167,10 @@ public class Timer { var6 = 65535L; } - var1.writeShort((int)var6); - var1.writeShort(this.field925); - var1.writeShort(this.field926); - var1.writeShort(this.field927); - var1.writeShort(this.field928); + buffer.writeShort((int)var6); + buffer.writeShort(this.field925); + buffer.writeShort(this.field926); + buffer.writeShort(this.field927); + buffer.writeShort(this.field928); } } diff --git a/runescape-client/src/main/java/UrlRequest.java b/runescape-client/src/main/java/UrlRequest.java index c911d6c9be..838bd46cd2 100644 --- a/runescape-client/src/main/java/UrlRequest.java +++ b/runescape-client/src/main/java/UrlRequest.java @@ -52,7 +52,8 @@ public class UrlRequest { signature = "(CI)Z", garbageValue = "-476632347" ) - public static boolean method3271(char var0) { + @Export("isCharAlphabetic") + public static boolean isCharAlphabetic(char var0) { return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; } } diff --git a/runescape-client/src/main/java/UrlRequester.java b/runescape-client/src/main/java/UrlRequester.java index 2ba47e291b..4d4eca1bb3 100644 --- a/runescape-client/src/main/java/UrlRequester.java +++ b/runescape-client/src/main/java/UrlRequester.java @@ -47,8 +47,8 @@ public class UrlRequester implements Runnable { garbageValue = "1097505066" ) @Export("request") - public UrlRequest request(URL var1) { - UrlRequest var2 = new UrlRequest(var1); + public UrlRequest request(URL url) { + UrlRequest var2 = new UrlRequest(url); synchronized(this) { this.requests.add(var2); this.notify(); @@ -76,8 +76,6 @@ public class UrlRequester implements Runnable { } - @Export("run") - @ObfuscatedName("run") public void run() { while (!this.isClosed) { try { diff --git a/runescape-client/src/main/java/User.java b/runescape-client/src/main/java/User.java index 51a619cdf7..9ce76ff9e5 100644 --- a/runescape-client/src/main/java/User.java +++ b/runescape-client/src/main/java/User.java @@ -10,8 +10,8 @@ public class User implements Comparable { @ObfuscatedSignature( signature = "Lkp;" ) - @Export("username0") - Username username0; + @Export("username") + Username username; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Lkp;" @@ -24,9 +24,9 @@ public class User implements Comparable { signature = "(I)Lkp;", garbageValue = "1922393088" ) - @Export("username") - public Username username() { - return this.username0; + @Export("getUsername") + public Username getUsername() { + return this.username; } @ObfuscatedName("v") @@ -34,9 +34,9 @@ public class User implements Comparable { signature = "(B)Ljava/lang/String;", garbageValue = "-60" ) - @Export("name") - public String name() { - return this.username0 == null ? "" : this.username0.getName(); + @Export("getName") + public String getName() { + return this.username == null ? "" : this.username.getName(); } @ObfuscatedName("ag") @@ -44,8 +44,8 @@ public class User implements Comparable { signature = "(I)Ljava/lang/String;", garbageValue = "1204003359" ) - @Export("previousName") - public String previousName() { + @Export("getPreviousName") + public String getPreviousName() { return this.previousUsername == null ? "" : this.previousUsername.getName(); } @@ -55,12 +55,12 @@ public class User implements Comparable { garbageValue = "1156866388" ) @Export("set") - void set(Username var1, Username var2) { - if (var1 == null) { + void set(Username username, Username previousUsername) { + if (username == null) { throw new NullPointerException(); } else { - this.username0 = var1; - this.previousUsername = var2; + this.username = username; + this.previousUsername = previousUsername; } } @@ -69,14 +69,12 @@ public class User implements Comparable { signature = "(Ljs;I)I", garbageValue = "1627362569" ) - @Export("compareTo0") - public int compareTo0(User var1) { - return this.username0.compareTo0(var1.username0); + @Export("compareToUser") + public int compareToUser(User other) { + return this.username.compareToTyped(other.username); } - @Export("compareTo") - @ObfuscatedName("compareTo") public int compareTo(Object var1) { - return this.compareTo0((User)var1); + return this.compareToUser((User)var1); } } diff --git a/runescape-client/src/main/java/UserComparator1.java b/runescape-client/src/main/java/UserComparator1.java index 2adcca3189..39effa29a3 100644 --- a/runescape-client/src/main/java/UserComparator1.java +++ b/runescape-client/src/main/java/UserComparator1.java @@ -8,10 +8,11 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("UserComparator1") public class UserComparator1 implements Comparator { @ObfuscatedName("m") - final boolean field931; + @Export("reversed") + final boolean reversed; public UserComparator1(boolean var1) { - this.field931 = var1; + this.reversed = var1; } @ObfuscatedName("m") @@ -19,18 +20,16 @@ public class UserComparator1 implements Comparator { signature = "(Ljs;Ljs;B)I", garbageValue = "68" ) - int method339(User var1, User var2) { - return this.field931 ? var1.compareTo0(var2) : var2.compareTo0(var1); + @Export("compareUser") + int compareUser(User var1, User var2) { + return this.reversed ? var1.compareToUser(var2) : var2.compareToUser(var1); } - @Export("compare") - @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.method339((User)var1, (User)var2); + return this.compareUser((User)var1, (User)var2); } - @ObfuscatedName("equals") - public boolean method340(Object var1) { + public boolean equals(Object var1) { return super.equals(var1); } } diff --git a/runescape-client/src/main/java/UserComparator10.java b/runescape-client/src/main/java/UserComparator10.java index e1fdf2f164..d6aee1b8e3 100644 --- a/runescape-client/src/main/java/UserComparator10.java +++ b/runescape-client/src/main/java/UserComparator10.java @@ -8,10 +8,11 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("UserComparator10") public class UserComparator10 extends AbstractUserComparator { @ObfuscatedName("m") - final boolean field932; + @Export("reversed") + final boolean reversed; public UserComparator10(boolean var1) { - this.field932 = var1; + this.reversed = var1; } @ObfuscatedName("m") @@ -19,14 +20,13 @@ public class UserComparator10 extends AbstractUserComparator { signature = "(Lke;Lke;B)I", garbageValue = "-15" ) - int method341(Buddy var1, Buddy var2) { - return Client.worldId == var1.world0 && var2.world0 == Client.worldId ? (this.field932 ? var1.int2 - var2.int2 : var2.int2 - var1.int2) : this.method12(var1, var2); + @Export("compareBuddy") + int compareBuddy(Buddy var1, Buddy var2) { + return Client.worldId == var1.world && var2.world == Client.worldId ? (this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2) : this.compareUser(var1, var2); } - @Export("compare") - @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.method341((Buddy)var1, (Buddy)var2); + return this.compareBuddy((Buddy)var1, (Buddy)var2); } @ObfuscatedName("hn") diff --git a/runescape-client/src/main/java/UserComparator2.java b/runescape-client/src/main/java/UserComparator2.java index 44a97180b0..a7b3995ba0 100644 --- a/runescape-client/src/main/java/UserComparator2.java +++ b/runescape-client/src/main/java/UserComparator2.java @@ -8,10 +8,11 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("UserComparator2") public class UserComparator2 implements Comparator { @ObfuscatedName("m") - final boolean field933; + @Export("reversed") + final boolean reversed; public UserComparator2(boolean var1) { - this.field933 = var1; + this.reversed = var1; } @ObfuscatedName("m") @@ -19,18 +20,16 @@ public class UserComparator2 implements Comparator { signature = "(Ljs;Ljs;I)I", garbageValue = "-2069683911" ) - int method342(User var1, User var2) { - return this.field933 ? var1.username().compareTo0(var2.username()) : var2.username().compareTo0(var1.username()); + @Export("compareTyped") + int compareTyped(User var1, User var2) { + return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); } - @ObfuscatedName("equals") - public boolean method343(Object var1) { + public boolean equals(Object var1) { return super.equals(var1); } - @Export("compare") - @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.method342((User)var1, (User)var2); + return this.compareTyped((User)var1, (User)var2); } } diff --git a/runescape-client/src/main/java/UserComparator3.java b/runescape-client/src/main/java/UserComparator3.java index d016050749..469ffc770c 100644 --- a/runescape-client/src/main/java/UserComparator3.java +++ b/runescape-client/src/main/java/UserComparator3.java @@ -10,8 +10,8 @@ public class UserComparator3 extends AbstractUserComparator { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache6") - static IndexCache indexCache6; + @Export("archive6") + static Archive archive6; @ObfuscatedName("fl") @ObfuscatedSignature( signature = "Lfm;" @@ -19,10 +19,11 @@ public class UserComparator3 extends AbstractUserComparator { @Export("socketTask") static Task socketTask; @ObfuscatedName("m") - final boolean field934; + @Export("reversed") + final boolean reversed; public UserComparator3(boolean var1) { - this.field934 = var1; + this.reversed = var1; } @ObfuscatedName("m") @@ -30,14 +31,13 @@ public class UserComparator3 extends AbstractUserComparator { signature = "(Lke;Lke;I)I", garbageValue = "-1157645406" ) - int method344(Buddy var1, Buddy var2) { - return var2.world0 != var1.world0 ? (this.field934 ? var1.world0 - var2.world0 : var2.world0 - var1.world0) : this.method12(var1, var2); + @Export("compareBuddy") + int compareBuddy(Buddy var1, Buddy var2) { + return var2.world != var1.world ? (this.reversed ? var1.world - var2.world : var2.world - var1.world) : this.compareUser(var1, var2); } - @Export("compare") - @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.method344((Buddy)var1, (Buddy)var2); + return this.compareBuddy((Buddy)var1, (Buddy)var2); } @ObfuscatedName("o") diff --git a/runescape-client/src/main/java/UserComparator4.java b/runescape-client/src/main/java/UserComparator4.java index 98b1c71cd6..63b67c7ca4 100644 --- a/runescape-client/src/main/java/UserComparator4.java +++ b/runescape-client/src/main/java/UserComparator4.java @@ -4,6 +4,7 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("ev") @Implements("UserComparator4") @@ -15,10 +16,11 @@ public class UserComparator4 implements Comparator { @Export("WorldMapElement_count") public static int WorldMapElement_count; @ObfuscatedName("m") - final boolean field935; + @Export("reversed") + final boolean reversed; public UserComparator4(boolean var1) { - this.field935 = var1; + this.reversed = var1; } @ObfuscatedName("m") @@ -26,19 +28,17 @@ public class UserComparator4 implements Comparator { signature = "(Lke;Lke;I)I", garbageValue = "950234237" ) - int method345(Buddy var1, Buddy var2) { - return this.field935 ? var1.int2 - var2.int2 : var2.int2 - var1.int2; + @Export("compareBuddy") + int compareBuddy(Buddy var1, Buddy var2) { + return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; } - @ObfuscatedName("equals") - public boolean method346(Object var1) { + public boolean equals(Object var1) { return super.equals(var1); } - @Export("compare") - @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.method345((Buddy)var1, (Buddy)var2); + return this.compareBuddy((Buddy)var1, (Buddy)var2); } @ObfuscatedName("f") @@ -56,22 +56,22 @@ public class UserComparator4 implements Comparator { garbageValue = "-2050984400" ) static int method3335(int var0, Script var1, boolean var2) { - if (var0 == 5306) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = SpotAnimationDefinition.method4822(); + if (var0 == ScriptOpcodes.GETWINDOWMODE) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = SpotAnimationDefinition.getWindowedMode(); return 1; } else { int var3; - if (var0 == 5307) { + if (var0 == ScriptOpcodes.SETWINDOWMODE) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if (var3 == 1 || var3 == 2) { - GroundItem.method2095(var3); + GroundItem.setWindowedMode(var3); } return 1; - } else if (var0 == 5308) { + } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.windowMode; return 1; - } else if (var0 != 5309) { + } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { if (var0 == 5310) { --RouteStrategy.Interpreter_intStackSize; return 1; diff --git a/runescape-client/src/main/java/UserComparator5.java b/runescape-client/src/main/java/UserComparator5.java index 7ef94fba67..d6631df263 100644 --- a/runescape-client/src/main/java/UserComparator5.java +++ b/runescape-client/src/main/java/UserComparator5.java @@ -7,10 +7,11 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("UserComparator5") public class UserComparator5 extends AbstractUserComparator { @ObfuscatedName("m") - final boolean field936; + @Export("reversed") + final boolean reversed; public UserComparator5(boolean var1) { - this.field936 = var1; + this.reversed = var1; } @ObfuscatedName("m") @@ -18,22 +19,21 @@ public class UserComparator5 extends AbstractUserComparator { signature = "(Lke;Lke;B)I", garbageValue = "-22" ) - int method347(Buddy var1, Buddy var2) { - if (var1.world0 != 0) { - if (var2.world0 == 0) { - return this.field936 ? -1 : 1; + @Export("compareBuddy") + int compareBuddy(Buddy var1, Buddy var2) { + if (var1.world != 0) { + if (var2.world == 0) { + return this.reversed ? -1 : 1; } - } else if (var2.world0 != 0) { - return this.field936 ? 1 : -1; + } else if (var2.world != 0) { + return this.reversed ? 1 : -1; } - return this.method12(var1, var2); + return this.compareUser(var1, var2); } - @Export("compare") - @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.method347((Buddy)var1, (Buddy)var2); + return this.compareBuddy((Buddy)var1, (Buddy)var2); } @ObfuscatedName("jk") @@ -45,7 +45,7 @@ public class UserComparator5 extends AbstractUserComparator { static final void worldToMinimap(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) { int var6 = var3 * var3 + var2 * var2; if (var6 > 4225 && var6 < 90000) { - int var7 = Client.minimapOrientation & 2047; + int var7 = Client.camAngleY & 2047; int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; int var10 = var3 * var8 + var9 * var2 >> 16; diff --git a/runescape-client/src/main/java/UserComparator6.java b/runescape-client/src/main/java/UserComparator6.java index 58325e9817..2ce3abcc8f 100644 --- a/runescape-client/src/main/java/UserComparator6.java +++ b/runescape-client/src/main/java/UserComparator6.java @@ -18,10 +18,11 @@ public class UserComparator6 extends AbstractUserComparator { ) static Widget field937; @ObfuscatedName("m") - final boolean field938; + @Export("reversed") + final boolean reversed; public UserComparator6(boolean var1) { - this.field938 = var1; + this.reversed = var1; } @ObfuscatedName("m") @@ -29,14 +30,13 @@ public class UserComparator6 extends AbstractUserComparator { signature = "(Lke;Lke;I)I", garbageValue = "750521759" ) - int method348(Buddy var1, Buddy var2) { - return var1.world0 != 0 && var2.world0 != 0 ? (this.field938 ? var1.username().compareTo0(var2.username()) : var2.username().compareTo0(var1.username())) : this.method12(var1, var2); + @Export("compareBuddy") + int compareBuddy(Buddy var1, Buddy var2) { + return var1.world != 0 && var2.world != 0 ? (this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername())) : this.compareUser(var1, var2); } - @Export("compare") - @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.method348((Buddy)var1, (Buddy)var2); + return this.compareBuddy((Buddy)var1, (Buddy)var2); } @ObfuscatedName("f") diff --git a/runescape-client/src/main/java/UserComparator7.java b/runescape-client/src/main/java/UserComparator7.java index 72f05177c9..a0c6b7e792 100644 --- a/runescape-client/src/main/java/UserComparator7.java +++ b/runescape-client/src/main/java/UserComparator7.java @@ -10,10 +10,11 @@ import net.runelite.rs.Reflection; @Implements("UserComparator7") public class UserComparator7 extends AbstractUserComparator { @ObfuscatedName("m") - final boolean field939; + @Export("reversed") + final boolean reversed; public UserComparator7(boolean var1) { - this.field939 = var1; + this.reversed = var1; } @ObfuscatedName("m") @@ -21,14 +22,13 @@ public class UserComparator7 extends AbstractUserComparator { signature = "(Lke;Lke;I)I", garbageValue = "-9252550" ) - int method349(Buddy var1, Buddy var2) { - return var1.world0 != 0 && var2.world0 != 0 ? (this.field939 ? var1.int2 - var2.int2 : var2.int2 - var1.int2) : this.method12(var1, var2); + @Export("compareBuddy") + int compareBuddy(Buddy var1, Buddy var2) { + return var1.world != 0 && var2.world != 0 ? (this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2) : this.compareUser(var1, var2); } - @Export("compare") - @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.method349((Buddy)var1, (Buddy)var2); + return this.compareBuddy((Buddy)var1, (Buddy)var2); } @ObfuscatedName("q") diff --git a/runescape-client/src/main/java/UserComparator8.java b/runescape-client/src/main/java/UserComparator8.java index a5a40b8595..f997c45574 100644 --- a/runescape-client/src/main/java/UserComparator8.java +++ b/runescape-client/src/main/java/UserComparator8.java @@ -7,10 +7,11 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("UserComparator8") public class UserComparator8 extends AbstractUserComparator { @ObfuscatedName("m") - final boolean field940; + @Export("reversed") + final boolean reversed; public UserComparator8(boolean var1) { - this.field940 = var1; + this.reversed = var1; } @ObfuscatedName("m") @@ -18,22 +19,21 @@ public class UserComparator8 extends AbstractUserComparator { signature = "(Lke;Lke;B)I", garbageValue = "0" ) - int method350(Buddy var1, Buddy var2) { - if (Client.worldId == var1.world0) { - if (var2.world0 != Client.worldId) { - return this.field940 ? -1 : 1; + @Export("compareBuddy") + int compareBuddy(Buddy var1, Buddy var2) { + if (Client.worldId == var1.world) { + if (var2.world != Client.worldId) { + return this.reversed ? -1 : 1; } - } else if (var2.world0 == Client.worldId) { - return this.field940 ? 1 : -1; + } else if (var2.world == Client.worldId) { + return this.reversed ? 1 : -1; } - return this.method12(var1, var2); + return this.compareUser(var1, var2); } - @Export("compare") - @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.method350((Buddy)var1, (Buddy)var2); + return this.compareBuddy((Buddy)var1, (Buddy)var2); } @ObfuscatedName("ke") diff --git a/runescape-client/src/main/java/UserComparator9.java b/runescape-client/src/main/java/UserComparator9.java index 0a6ed5f44d..fedabeaa4c 100644 --- a/runescape-client/src/main/java/UserComparator9.java +++ b/runescape-client/src/main/java/UserComparator9.java @@ -8,10 +8,11 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("UserComparator9") public class UserComparator9 extends AbstractUserComparator { @ObfuscatedName("m") - final boolean field941; + @Export("reversed") + final boolean reversed; public UserComparator9(boolean var1) { - this.field941 = var1; + this.reversed = var1; } @ObfuscatedName("m") @@ -19,14 +20,13 @@ public class UserComparator9 extends AbstractUserComparator { signature = "(Lke;Lke;I)I", garbageValue = "1966780392" ) - int method351(Buddy var1, Buddy var2) { - return Client.worldId == var1.world0 && var2.world0 == Client.worldId ? (this.field941 ? var1.username().compareTo0(var2.username()) : var2.username().compareTo0(var1.username())) : this.method12(var1, var2); + @Export("compareBuddy") + int compareBuddy(Buddy var1, Buddy var2) { + return Client.worldId == var1.world && var2.world == Client.worldId ? (this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername())) : this.compareUser(var1, var2); } - @Export("compare") - @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.method351((Buddy)var1, (Buddy)var2); + return this.compareBuddy((Buddy)var1, (Buddy)var2); } @ObfuscatedName("m") @@ -85,7 +85,7 @@ public class UserComparator9 extends AbstractUserComparator { VarbitDefinition.indexedSpriteWidths = null; SecureRandomCallable.indexedSpriteHeights = null; class328.indexedSpritePalette = null; - class328.spritePixels = (byte[][])null; + class328.spritePixels = ((byte[][])null); return var0; } } diff --git a/runescape-client/src/main/java/UserList.java b/runescape-client/src/main/java/UserList.java index bca808e17d..1db071698b 100644 --- a/runescape-client/src/main/java/UserList.java +++ b/runescape-client/src/main/java/UserList.java @@ -61,7 +61,7 @@ public abstract class UserList { garbageValue = "861814350" ) @Export("newTypedArray") - abstract User[] newTypedArray(int var1); + abstract User[] newTypedArray(int size); @ObfuscatedName("z") @ObfuscatedSignature( @@ -102,8 +102,8 @@ public abstract class UserList { garbageValue = "933434965" ) @Export("contains") - public boolean contains(Username var1) { - return var1.hasCleanName() && (this.usernamesMap.containsKey(var1) || this.previousUsernamesMap.containsKey(var1)); + public boolean contains(Username username) { + return username.hasCleanName() && (this.usernamesMap.containsKey(username) || this.previousUsernamesMap.containsKey(username)); } @ObfuscatedName("y") @@ -112,9 +112,9 @@ public abstract class UserList { garbageValue = "-291023874" ) @Export("getByUsername") - public User getByUsername(Username var1) { - User var2 = this.getByCurrentUsername(var1); - return var2 != null ? var2 : this.getByPreviousUsername(var1); + public User getByUsername(Username username) { + User var2 = this.getByCurrentUsername(username); + return var2 != null ? var2 : this.getByPreviousUsername(username); } @ObfuscatedName("h") @@ -123,8 +123,8 @@ public abstract class UserList { garbageValue = "-1364698032" ) @Export("getByCurrentUsername") - User getByCurrentUsername(Username var1) { - return !var1.hasCleanName() ? null : (User)this.usernamesMap.get(var1); + User getByCurrentUsername(Username username) { + return !username.hasCleanName() ? null : (User)this.usernamesMap.get(username); } @ObfuscatedName("b") @@ -133,8 +133,8 @@ public abstract class UserList { garbageValue = "-1976876334" ) @Export("getByPreviousUsername") - User getByPreviousUsername(Username var1) { - return !var1.hasCleanName() ? null : (User)this.previousUsernamesMap.get(var1); + User getByPreviousUsername(Username previousUsername) { + return !previousUsername.hasCleanName() ? null : (User)this.previousUsernamesMap.get(previousUsername); } @ObfuscatedName("c") @@ -143,8 +143,8 @@ public abstract class UserList { garbageValue = "7857" ) @Export("removeByUsername") - public final boolean removeByUsername(Username var1) { - User var2 = this.getByCurrentUsername(var1); + public final boolean removeByUsername(Username username) { + User var2 = this.getByCurrentUsername(username); if (var2 == null) { return false; } else { @@ -159,11 +159,11 @@ public abstract class UserList { garbageValue = "-1991960360" ) @Export("remove") - final void remove(User var1) { - int var2 = this.indexOf(var1); + final void remove(User user) { + int var2 = this.indexOf(user); if (var2 != -1) { this.arrayRemove(var2); - this.mapRemove(var1); + this.mapRemove(user); } } @@ -174,8 +174,8 @@ public abstract class UserList { garbageValue = "-1137431921" ) @Export("addLastNoPreviousUsername") - User addLastNoPreviousUsername(Username var1) { - return this.addLast(var1, (Username)null); + User addLastNoPreviousUsername(Username username) { + return this.addLast(username, (Username)null); } @ObfuscatedName("ag") @@ -184,12 +184,12 @@ public abstract class UserList { garbageValue = "1445676158" ) @Export("addLast") - User addLast(Username var1, Username var2) { - if (this.getByCurrentUsername(var1) != null) { + User addLast(Username username, Username previousUsername) { + if (this.getByCurrentUsername(username) != null) { throw new IllegalStateException(); } else { User var3 = this.newInstance(); - var3.set(var1, var2); + var3.set(username, previousUsername); this.arrayAddLast(var3); this.mapPut(var3); return var3; @@ -202,11 +202,11 @@ public abstract class UserList { garbageValue = "-1676228472" ) @Export("get") - public final User get(int var1) { - if (var1 >= 0 && var1 < this.size0) { - return this.array[var1]; + public final User get(int index) { + if (index >= 0 && index < this.size0) { + return this.array[index]; } else { - throw new ArrayIndexOutOfBoundsException(var1); + throw new ArrayIndexOutOfBoundsException(index); } } @@ -231,10 +231,10 @@ public abstract class UserList { garbageValue = "35" ) @Export("changeName") - final void changeName(User var1, Username var2, Username var3) { - this.mapRemove(var1); - var1.set(var2, var3); - this.mapPut(var1); + final void changeName(User user, Username username, Username previousUsername) { + this.mapRemove(user); + user.set(username, previousUsername); + this.mapPut(user); } @ObfuscatedName("ar") @@ -243,9 +243,9 @@ public abstract class UserList { garbageValue = "-1908653684" ) @Export("indexOf") - final int indexOf(User var1) { + final int indexOf(User user) { for (int var2 = 0; var2 < this.size0; ++var2) { - if (this.array[var2] == var1) { + if (this.array[var2] == user) { return var2; } } @@ -259,9 +259,9 @@ public abstract class UserList { garbageValue = "-20791" ) @Export("mapRemove") - final void mapRemove(User var1) { - if (var1.previousUsername != null) { - this.previousUsernamesMap.remove(var1.previousUsername); + final void mapRemove(User user) { + if (user.previousUsername != null) { + this.previousUsernamesMap.remove(user.previousUsername); } } @@ -272,8 +272,8 @@ public abstract class UserList { garbageValue = "1398315954" ) @Export("arrayAddLast") - final void arrayAddLast(User var1) { - this.array[++this.size0 - 1] = var1; + final void arrayAddLast(User user) { + this.array[++this.size0 - 1] = user; } @ObfuscatedName("ah") @@ -282,11 +282,11 @@ public abstract class UserList { garbageValue = "103" ) @Export("mapPut") - final void mapPut(User var1) { - this.usernamesMap.put(var1.username0, var1); - if (var1.previousUsername != null) { - User var2 = (User)this.previousUsernamesMap.put(var1.previousUsername, var1); - if (var2 != null && var2 != var1) { + final void mapPut(User user) { + this.usernamesMap.put(user.username, user); + if (user.previousUsername != null) { + User var2 = (User)this.previousUsernamesMap.put(user.previousUsername, user); + if (var2 != null && var2 != user) { var2.previousUsername = null; } } @@ -299,10 +299,10 @@ public abstract class UserList { garbageValue = "-616972929" ) @Export("arrayRemove") - final void arrayRemove(int var1) { + final void arrayRemove(int index) { --this.size0; - if (var1 < this.size0) { - System.arraycopy(this.array, var1 + 1, this.array, var1, this.size0 - var1); + if (index < this.size0) { + System.arraycopy(this.array, index + 1, this.array, index, this.size0 - index); } } @@ -327,7 +327,7 @@ public abstract class UserList { if (this.comparator == null) { this.comparator = var1; } else if (this.comparator instanceof AbstractUserComparator) { - ((AbstractUserComparator)this.comparator).method11(var1); + ((AbstractUserComparator)this.comparator).addComparator(var1); } } diff --git a/runescape-client/src/main/java/Username.java b/runescape-client/src/main/java/Username.java index 8d5f6e22b8..e9d4e0cf48 100644 --- a/runescape-client/src/main/java/Username.java +++ b/runescape-client/src/main/java/Username.java @@ -10,8 +10,8 @@ public class Username implements Comparable { @Export("Interpreter_intLocals") static int[] Interpreter_intLocals; @ObfuscatedName("m") - @Export("name0") - String name0; + @Export("name") + String name; @ObfuscatedName("f") @Export("cleanName") String cleanName; @@ -20,7 +20,7 @@ public class Username implements Comparable { signature = "(Ljava/lang/String;Llx;)V" ) public Username(String var1, LoginType var2) { - this.name0 = var1; + this.name = var1; this.cleanName = Message.method1229(var1, var2); } @@ -31,7 +31,7 @@ public class Username implements Comparable { ) @Export("getName") public String getName() { - return this.name0; + return this.name; } @ObfuscatedName("f") @@ -49,39 +49,33 @@ public class Username implements Comparable { signature = "(Lkp;B)I", garbageValue = "8" ) - @Export("compareTo0") - public int compareTo0(Username var1) { - return this.cleanName == null ? (var1.cleanName == null ? 0 : 1) : (var1.cleanName == null ? -1 : this.cleanName.compareTo(var1.cleanName)); + @Export("compareToTyped") + public int compareToTyped(Username other) { + return this.cleanName == null ? (other.cleanName == null ? 0 : 1) : (other.cleanName == null ? -1 : this.cleanName.compareTo(other.cleanName)); } - @Export("equals") - @ObfuscatedName("equals") public boolean equals(Object var1) { if (var1 instanceof Username) { Username var2 = (Username)var1; if (this.cleanName == null) { return var2.cleanName == null; } else { - return var2.cleanName != null && this.method352() == var2.method352() && this.cleanName.equals(var2.cleanName); + return var2.cleanName != null && this.hashCode() == var2.hashCode() && this.cleanName.equals(var2.cleanName); } } else { return false; } } - @ObfuscatedName("hashCode") - public int method352() { + public int hashCode() { return this.cleanName == null ? 0 : this.cleanName.hashCode(); } - @ObfuscatedName("toString") - public String method353() { + public String toString() { return this.getName(); } - @Export("compareTo") - @ObfuscatedName("compareTo") public int compareTo(Object var1) { - return this.compareTo0((Username)var1); + return this.compareToTyped((Username)var1); } } diff --git a/runescape-client/src/main/java/VarbitDefinition.java b/runescape-client/src/main/java/VarbitDefinition.java index 3f2d265505..f1b032e4fb 100644 --- a/runescape-client/src/main/java/VarbitDefinition.java +++ b/runescape-client/src/main/java/VarbitDefinition.java @@ -11,8 +11,8 @@ public class VarbitDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("VarbitDefinition_indexCache") - static AbstractIndexCache VarbitDefinition_indexCache; + @Export("VarbitDefinition_archive") + static AbstractArchive VarbitDefinition_archive; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Ler;" @@ -26,35 +26,35 @@ public class VarbitDefinition extends DualNode { @ObfuscatedGetter( intValue = 1552575189 ) - @Export("varp") - public int varp; + @Export("baseVar") + public int baseVar; @ObfuscatedName("w") @ObfuscatedGetter( intValue = -870948181 ) - @Export("lowBit") - public int lowBit; + @Export("startBit") + public int startBit; @ObfuscatedName("o") @ObfuscatedGetter( intValue = -1710935305 ) - @Export("highBit") - public int highBit; + @Export("endBit") + public int endBit; @ObfuscatedName("q") @ObfuscatedSignature( signature = "(Lgr;I)V", garbageValue = "-1888757206" ) - @Export("read") - void read(Buffer var1) { + @Export("decode") + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -63,12 +63,12 @@ public class VarbitDefinition extends DualNode { signature = "(Lgr;IB)V", garbageValue = "-76" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { if (var2 == 1) { - this.varp = var1.readUnsignedShort(); - this.lowBit = var1.readUnsignedByte(); - this.highBit = var1.readUnsignedByte(); + this.baseVar = var1.readUnsignedShort(); + this.startBit = var1.readUnsignedByte(); + this.endBit = var1.readUnsignedByte(); } } diff --git a/runescape-client/src/main/java/VarcInt.java b/runescape-client/src/main/java/VarcInt.java index 359502ebb5..3f88e84cf1 100644 --- a/runescape-client/src/main/java/VarcInt.java +++ b/runescape-client/src/main/java/VarcInt.java @@ -11,7 +11,7 @@ public class VarcInt extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - static AbstractIndexCache field942; + static AbstractArchive field942; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Ler;" @@ -60,8 +60,8 @@ public class VarcInt extends DualNode { garbageValue = "1680587190" ) @Export("loadClassFromDescriptor") - static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException { - return var0.equals("B") ? Byte.TYPE : (var0.equals("I") ? Integer.TYPE : (var0.equals("S") ? Short.TYPE : (var0.equals("J") ? Long.TYPE : (var0.equals("Z") ? Boolean.TYPE : (var0.equals("F") ? Float.TYPE : (var0.equals("D") ? Double.TYPE : (var0.equals("C") ? Character.TYPE : (var0.equals("void") ? Void.TYPE : Reflection.findClass(var0))))))))); + static Class loadClassFromDescriptor(String descriptor) throws ClassNotFoundException { + return descriptor.equals("B") ? Byte.TYPE : (descriptor.equals("I") ? Integer.TYPE : (descriptor.equals("S") ? Short.TYPE : (descriptor.equals("J") ? Long.TYPE : (descriptor.equals("Z") ? Boolean.TYPE : (descriptor.equals("F") ? Float.TYPE : (descriptor.equals("D") ? Double.TYPE : (descriptor.equals("C") ? Character.TYPE : (descriptor.equals("void") ? Void.TYPE : Reflection.findClass(descriptor))))))))); } @ObfuscatedName("a") diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java index bd18c01a0c..6a64bd9e0d 100644 --- a/runescape-client/src/main/java/Varcs.java +++ b/runescape-client/src/main/java/Varcs.java @@ -33,7 +33,7 @@ public class Varcs { Varcs() { this.unwrittenChanges = false; - int var1 = ObjectSound.indexCache2.method4(19); + int var1 = ObjectSound.archive2.method4(19); this.map = new HashMap(); this.intsPersistence = new boolean[var1]; @@ -44,8 +44,8 @@ public class Varcs { } var2 = 0; - if (ObjectSound.indexCache2.method133(15)) { - var2 = ObjectSound.indexCache2.method4(15); + if (ObjectSound.archive2.method133(15)) { + var2 = ObjectSound.archive2.method4(15); } this.strings = new String[var2]; @@ -58,9 +58,9 @@ public class Varcs { garbageValue = "920518911" ) @Export("setInt") - void setInt(int var1, int var2) { - this.map.put(var1, var2); - if (this.intsPersistence[var1]) { + void setInt(int index, int var2) { + this.map.put(index, var2); + if (this.intsPersistence[index]) { this.unwrittenChanges = true; } @@ -72,8 +72,8 @@ public class Varcs { garbageValue = "6" ) @Export("getInt") - int getInt(int var1) { - Object var2 = this.map.get(var1); + int getInt(int index) { + Object var2 = this.map.get(index); return var2 instanceof Integer ? (Integer)var2 : -1; } @@ -83,8 +83,8 @@ public class Varcs { garbageValue = "12847051" ) @Export("setString") - void setString(int var1, String var2) { - this.map.put(var1, var2); + void setString(int index, String var2) { + this.map.put(index, var2); } @ObfuscatedName("w") @@ -93,8 +93,8 @@ public class Varcs { garbageValue = "897961099" ) @Export("getString") - String getString(int var1) { - Object var2 = this.map.get(var1); + String getString(int index) { + Object var2 = this.map.get(index); return var2 instanceof String ? (String)var2 : ""; } @@ -104,8 +104,8 @@ public class Varcs { garbageValue = "15" ) @Export("setStringOld") - void setStringOld(int var1, String var2) { - this.strings[var1] = var2; + void setStringOld(int index, String var2) { + this.strings[index] = var2; } @ObfuscatedName("u") @@ -114,8 +114,8 @@ public class Varcs { garbageValue = "0" ) @Export("getStringOld") - String getStringOld(int var1) { - return this.strings[var1]; + String getStringOld(int index) { + return this.strings[index]; } @ObfuscatedName("g") @@ -171,79 +171,87 @@ public class Varcs { if (var7 instanceof Integer) { var2 += 4; } else if (var7 instanceof String) { - var2 += WorldMapRegion.method550((String)var7); + var2 += WorldMapRegion.stringCp1252NullTerminatedByteSize((String)var7); } ++var3; } } - Buffer var29 = new Buffer(var2); - var29.writeByte(2); - var29.writeShort(var3); - Iterator var30 = this.map.entrySet().iterator(); + Buffer var28 = new Buffer(var2); + var28.writeByte(2); + var28.writeShort(var3); + Iterator var29 = this.map.entrySet().iterator(); - label187: + label179: while (true) { - int var8; - Entry var31; + Entry var8; + int var30; do { - if (!var30.hasNext()) { - var1.write(var29.array, 0, var29.index); - break label187; + if (!var29.hasNext()) { + var1.write(var28.array, 0, var28.index); + break label179; } - var31 = (Entry)var30.next(); - var8 = (Integer)var31.getKey(); - } while(!this.intsPersistence[var8]); + var8 = (Entry)var29.next(); + var30 = (Integer)var8.getKey(); + } while(!this.intsPersistence[var30]); - var29.writeShort(var8); - Object var9 = var31.getValue(); + var28.writeShort(var30); + Object var9 = var8.getValue(); Class var10 = var9.getClass(); class3[] var11 = class3.method34(); + int var13 = 0; - class3 var13; - label174: { - for (int var12 = 0; var12 < var11.length; ++var12) { - class3 var14 = var11[var12]; - if (var10 == var14.field18) { - var13 = var14; - break label174; - } + class3 var12; + while (true) { + if (var13 >= var11.length) { + var12 = null; + break; } - var13 = null; - } - - var29.writeByte(var13.field1147); - Class var32 = var9.getClass(); - class3[] var15 = class3.method34(); - - class3 var17; - label184: { - for (int var16 = 0; var16 < var15.length; ++var16) { - class3 var18 = var15[var16]; - if (var32 == var18.field18) { - var17 = var18; - break label184; - } + class3 var14 = var11[var13]; + if (var10 == var14.field18) { + var12 = var14; + break; } - var17 = null; + ++var13; } - if (var17 == null) { + var28.writeByte(var12.field1147); + Class var31 = var9.getClass(); + class3[] var32 = class3.method34(); + int var16 = 0; + + class3 var15; + while (true) { + if (var16 >= var32.length) { + var15 = null; + break; + } + + class3 var17 = var32[var16]; + if (var31 == var17.field18) { + var15 = var17; + break; + } + + ++var16; + } + + if (var15 == null) { throw new IllegalArgumentException(); } - class0 var33 = var17.field19; - var33.vmethod44(var9, var29); + class0 var33 = var15.field19; + var33.vmethod44(var9, var28); } - } catch (Exception var27) { + } catch (Exception var26) { } finally { try { var1.close(); - } catch (Exception var26) { + } catch (Exception var25) { } } @@ -261,84 +269,68 @@ public class Varcs { void read() { AccessFile var1 = this.getPreferencesFile(false); - label225: { - try { - byte[] var2 = new byte[(int)var1.length()]; + try { + byte[] var2 = new byte[(int)var1.length()]; - int var3; - for (int var4 = 0; var4 < var2.length; var4 += var3) { - var3 = var1.read(var2, var4, var2.length - var4); - if (var3 == -1) { - throw new EOFException(); - } + int var3; + for (int var4 = 0; var4 < var2.length; var4 += var3) { + var3 = var1.read(var2, var4, var2.length - var4); + if (var3 == -1) { + throw new EOFException(); } - - Buffer var25 = new Buffer(var2); - if (var25.array.length - var25.index < 1) { - return; - } - - int var5 = var25.readUnsignedByte(); - if (var5 >= 0 && var5 <= 2) { - int var6; - int var7; - int var8; - int var9; - if (var5 >= 2) { - var9 = var25.readUnsignedShort(); - var6 = 0; - - while (true) { - if (var6 >= var9) { - break label225; - } - - var7 = var25.readUnsignedShort(); - var8 = var25.readUnsignedByte(); - class3 var10 = (class3)ScriptFrame.findEnumerated(class3.method34(), var8); - Object var11 = var10.method31(var25); - if (this.intsPersistence[var7]) { - this.map.put(var7, var11); - } - - ++var6; - } - } else { - var9 = var25.readUnsignedShort(); - - for (var6 = 0; var6 < var9; ++var6) { - var7 = var25.readUnsignedShort(); - var8 = var25.readInt(); - if (this.intsPersistence[var7]) { - this.map.put(var7, var8); - } - } - - var6 = var25.readUnsignedShort(); - var7 = 0; - - while (true) { - if (var7 >= var6) { - break label225; - } - - var25.readUnsignedShort(); - var25.readStringCp1252NullTerminated(); - ++var7; - } - } - } - } catch (Exception var23) { - break label225; - } finally { - try { - var1.close(); - } catch (Exception var22) { - } - } - return; + Buffer var24 = new Buffer(var2); + if (var24.array.length - var24.index < 1) { + return; + } + + int var5 = var24.readUnsignedByte(); + if (var5 < 0 || var5 > 2) { + return; + } + + int var6; + int var7; + int var8; + int var9; + if (var5 >= 2) { + var9 = var24.readUnsignedShort(); + + for (var6 = 0; var6 < var9; ++var6) { + var7 = var24.readUnsignedShort(); + var8 = var24.readUnsignedByte(); + class3 var10 = (class3)ScriptFrame.findEnumerated(class3.method34(), var8); + Object var11 = var10.method31(var24); + if (this.intsPersistence[var7]) { + this.map.put(var7, var11); + } + } + } else { + var9 = var24.readUnsignedShort(); + + for (var6 = 0; var6 < var9; ++var6) { + var7 = var24.readUnsignedShort(); + var8 = var24.readInt(); + if (this.intsPersistence[var7]) { + this.map.put(var7, var8); + } + } + + var6 = var24.readUnsignedShort(); + + for (var7 = 0; var7 < var6; ++var7) { + var24.readUnsignedShort(); + var24.readStringCp1252NullTerminated(); + } + } + } catch (Exception var22) { + } finally { + try { + var1.close(); + } catch (Exception var21) { + } + } this.unwrittenChanges = false; @@ -372,8 +364,8 @@ public class Varcs { signature = "(Lir;I)V", garbageValue = "321265868" ) - public static void method2160(AbstractIndexCache var0) { - OverlayDefinition.field663 = var0; + public static void method2160(AbstractArchive var0) { + FloorOverlayDefinition.field663 = var0; } @ObfuscatedName("q") @@ -388,8 +380,8 @@ public class Varcs { for (var6 = 0; var6 < 64; ++var6) { for (var7 = 0; var7 < 64; ++var7) { if (var6 + var1 > 0 && var6 + var1 < 103 && var7 + var2 > 0 && var7 + var2 < 103) { - int[] var10000 = var5[var8].flags[var6 + var1]; - var10000[var7 + var2] &= -16777217; + int[] var9 = var5[var8].flags[var6 + var1]; + var9[var7 + var2] &= -16777217; } } } @@ -399,8 +391,8 @@ public class Varcs { for (var6 = 0; var6 < 4; ++var6) { for (var7 = 0; var7 < 64; ++var7) { - for (int var9 = 0; var9 < 64; ++var9) { - TotalQuantityComparator.loadTerrain(var10, var6, var7 + var1, var9 + var2, var3, var4, 0); + for (int var11 = 0; var11 < 64; ++var11) { + GrandExchangeOfferTotalQuantityComparator.loadTerrain(var10, var6, var7 + var1, var11 + var2, var3, var4, 0); } } } diff --git a/runescape-client/src/main/java/VarpDefinition.java b/runescape-client/src/main/java/VarpDefinition.java index b650c9347c..93e4af9d40 100644 --- a/runescape-client/src/main/java/VarpDefinition.java +++ b/runescape-client/src/main/java/VarpDefinition.java @@ -11,7 +11,7 @@ public class VarpDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field943; + public static AbstractArchive field943; @ObfuscatedName("f") @ObfuscatedGetter( intValue = 510774535 @@ -39,15 +39,15 @@ public class VarpDefinition extends DualNode { signature = "(Lgr;B)V", garbageValue = "-41" ) - @Export("read") - void read(Buffer var1) { + @Export("decode") + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -56,8 +56,8 @@ public class VarpDefinition extends DualNode { signature = "(Lgr;II)V", garbageValue = "-1859920822" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { if (var2 == 5) { this.type = var1.readUnsignedShort(); } diff --git a/runescape-client/src/main/java/Varps.java b/runescape-client/src/main/java/Varps.java index 57745938a0..a18fcda29b 100644 --- a/runescape-client/src/main/java/Varps.java +++ b/runescape-client/src/main/java/Varps.java @@ -28,8 +28,8 @@ public class Varps { signature = "(Lir;I)V", garbageValue = "2111080001" ) - public static void method4393(AbstractIndexCache var0) { - UnderlayDefinition.UnderlayDefinition_indexCache = var0; + public static void method4393(AbstractArchive var0) { + FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var0; } @ObfuscatedName("ki") diff --git a/runescape-client/src/main/java/ViewportMouse.java b/runescape-client/src/main/java/ViewportMouse.java index 57312a18ae..8ca879af33 100644 --- a/runescape-client/src/main/java/ViewportMouse.java +++ b/runescape-client/src/main/java/ViewportMouse.java @@ -3,6 +3,7 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("dm") @Implements("ViewportMouse") @@ -72,22 +73,22 @@ public class ViewportMouse { ) static int method2983(int var0, Script var1, boolean var2) { Widget var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); - if (var0 == 2500) { + if (var0 == ScriptOpcodes.IF_GETX) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.x; return 1; - } else if (var0 == 2501) { + } else if (var0 == ScriptOpcodes.IF_GETY) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.y; return 1; - } else if (var0 == 2502) { + } else if (var0 == ScriptOpcodes.IF_GETWIDTH) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.width; return 1; - } else if (var0 == 2503) { + } else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.height; return 1; - } else if (var0 == 2504) { + } else if (var0 == ScriptOpcodes.IF_GETHIDE) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; return 1; - } else if (var0 == 2505) { + } else if (var0 == ScriptOpcodes.IF_GETLAYER) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.parentId; return 1; } else { diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index f29255a2e9..11fb4c6deb 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -17,22 +17,22 @@ public class Widget extends Node { @ObfuscatedSignature( signature = "[[Lho;" ) - @Export("widgets") - public static Widget[][] widgets; + @Export("interfaceComponents") + public static Widget[][] interfaceComponents; @ObfuscatedName("l") - @Export("loadedWidgetGroups") - public static boolean[] loadedWidgetGroups; + @Export("loadedInterfaces") + public static boolean[] loadedInterfaces; @ObfuscatedName("e") @ObfuscatedSignature( signature = "Lir;" ) - @Export("Widget_indexCache") - public static AbstractIndexCache Widget_indexCache; + @Export("Widget_archive") + public static AbstractArchive Widget_archive; @ObfuscatedName("d") @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field955; + public static AbstractArchive field955; @ObfuscatedName("n") @ObfuscatedSignature( signature = "Ler;" @@ -383,7 +383,8 @@ public class Widget extends Node { @Export("modelOrthog") public boolean modelOrthog; @ObfuscatedName("bv") - public boolean field964; + @Export("modelTransparency") + public boolean modelTransparency; @ObfuscatedName("bw") @ObfuscatedGetter( intValue = -1658511475 @@ -560,25 +561,32 @@ public class Widget extends Node { @Export("onScroll") public Object[] onScroll; @ObfuscatedName("em") - public Object[] field970; + @Export("onChatTransmit") + public Object[] onChatTransmit; @ObfuscatedName("ed") - @Export("onKeyListener") - public Object[] onKeyListener; + @Export("onKey") + public Object[] onKey; @ObfuscatedName("ex") - public Object[] field971; + @Export("onFriendTransmit") + public Object[] onFriendTransmit; @ObfuscatedName("ej") - public Object[] field972; + @Export("onClanTransmit") + public Object[] onClanTransmit; @ObfuscatedName("el") - public Object[] field973; + @Export("onMiscTransmit") + public Object[] onMiscTransmit; @ObfuscatedName("en") - @Export("onDialogAbortListener") - public Object[] onDialogAbortListener; + @Export("onDialogAbort") + public Object[] onDialogAbort; @ObfuscatedName("ei") - public Object[] field974; + @Export("onSubChange") + public Object[] onSubChange; @ObfuscatedName("ee") - public Object[] field975; + @Export("onResize") + public Object[] onResize; @ObfuscatedName("eq") - public Object[] field976; + @Export("onStockTransmit") + public Object[] onStockTransmit; @ObfuscatedName("eh") public Object[] field977; @ObfuscatedName("eo") @@ -742,7 +750,7 @@ public class Widget extends Node { this.field962 = 0; this.field963 = 0; this.modelOrthog = false; - this.field964 = false; + this.modelTransparency = false; this.itemQuantityMode = 2; this.fontId = -1; this.text = ""; @@ -788,41 +796,41 @@ public class Widget extends Node { garbageValue = "688173225" ) @Export("decodeLegacy") - void decodeLegacy(Buffer var1) { + void decodeLegacy(Buffer buffer) { this.isIf3 = false; - this.type = var1.readUnsignedByte(); - this.buttonType = var1.readUnsignedByte(); - this.contentType = var1.readUnsignedShort(); - this.rawX = var1.method44(); - this.rawY = var1.method44(); - this.rawWidth = var1.readUnsignedShort(); - this.rawHeight = var1.readUnsignedShort(); - this.transparency = var1.readUnsignedByte(); - this.parentId = var1.readUnsignedShort(); + this.type = buffer.readUnsignedByte(); + this.buttonType = buffer.readUnsignedByte(); + this.contentType = buffer.readUnsignedShort(); + this.rawX = buffer.method44(); + this.rawY = buffer.method44(); + this.rawWidth = buffer.readUnsignedShort(); + this.rawHeight = buffer.readUnsignedShort(); + this.transparency = buffer.readUnsignedByte(); + this.parentId = buffer.readUnsignedShort(); if (this.parentId == 65535) { this.parentId = -1; } else { this.parentId += this.id & -65536; } - this.mouseOverRedirect = var1.readUnsignedShort(); + this.mouseOverRedirect = buffer.readUnsignedShort(); if (this.mouseOverRedirect == 65535) { this.mouseOverRedirect = -1; } - int var2 = var1.readUnsignedByte(); + int var2 = buffer.readUnsignedByte(); int var3; if (var2 > 0) { this.cs1Comparisons = new int[var2]; this.cs1ComparisonValues = new int[var2]; for (var3 = 0; var3 < var2; ++var3) { - this.cs1Comparisons[var3] = var1.readUnsignedByte(); - this.cs1ComparisonValues[var3] = var1.readUnsignedShort(); + this.cs1Comparisons[var3] = buffer.readUnsignedByte(); + this.cs1ComparisonValues[var3] = buffer.readUnsignedShort(); } } - var3 = var1.readUnsignedByte(); + var3 = buffer.readUnsignedByte(); int var4; int var5; int var6; @@ -830,11 +838,11 @@ public class Widget extends Node { this.cs1Instructions = new int[var3][]; for (var4 = 0; var4 < var3; ++var4) { - var5 = var1.readUnsignedShort(); + var5 = buffer.readUnsignedShort(); this.cs1Instructions[var4] = new int[var5]; for (var6 = 0; var6 < var5; ++var6) { - this.cs1Instructions[var4][var6] = var1.readUnsignedShort(); + this.cs1Instructions[var4][var6] = buffer.readUnsignedShort(); if (this.cs1Instructions[var4][var6] == 65535) { this.cs1Instructions[var4][var6] = -1; } @@ -843,51 +851,51 @@ public class Widget extends Node { } if (this.type == 0) { - this.scrollHeight = var1.readUnsignedShort(); - this.isHidden = var1.readUnsignedByte() == 1; + this.scrollHeight = buffer.readUnsignedShort(); + this.isHidden = buffer.readUnsignedByte() == 1; } if (this.type == 1) { - var1.readUnsignedShort(); - var1.readUnsignedByte(); + buffer.readUnsignedShort(); + buffer.readUnsignedByte(); } if (this.type == 2) { this.itemIds = new int[this.rawHeight * this.rawWidth]; this.itemQuantities = new int[this.rawWidth * this.rawHeight]; - var4 = var1.readUnsignedByte(); + var4 = buffer.readUnsignedByte(); if (var4 == 1) { this.clickMask |= 268435456; } - var5 = var1.readUnsignedByte(); + var5 = buffer.readUnsignedByte(); if (var5 == 1) { this.clickMask |= 1073741824; } - var6 = var1.readUnsignedByte(); + var6 = buffer.readUnsignedByte(); if (var6 == 1) { this.clickMask |= Integer.MIN_VALUE; } - int var7 = var1.readUnsignedByte(); + int var7 = buffer.readUnsignedByte(); if (var7 == 1) { this.clickMask |= 536870912; } - this.paddingX = var1.readUnsignedByte(); - this.paddingY = var1.readUnsignedByte(); + this.paddingX = buffer.readUnsignedByte(); + this.paddingY = buffer.readUnsignedByte(); this.inventoryXOffsets = new int[20]; this.inventoryYOffsets = new int[20]; this.inventorySprites = new int[20]; int var8; for (var8 = 0; var8 < 20; ++var8) { - int var9 = var1.readUnsignedByte(); + int var9 = buffer.readUnsignedByte(); if (var9 == 1) { - this.inventoryXOffsets[var8] = var1.method44(); - this.inventoryYOffsets[var8] = var1.method44(); - this.inventorySprites[var8] = var1.readInt(); + this.inventoryXOffsets[var8] = buffer.method44(); + this.inventoryYOffsets[var8] = buffer.method44(); + this.inventorySprites[var8] = buffer.readInt(); } else { this.inventorySprites[var8] = -1; } @@ -896,7 +904,7 @@ public class Widget extends Node { this.itemActions = new String[5]; for (var8 = 0; var8 < 5; ++var8) { - String var11 = var1.readStringCp1252NullTerminated(); + String var11 = buffer.readStringCp1252NullTerminated(); if (var11.length() > 0) { this.itemActions[var8] = var11; this.clickMask |= 1 << var8 + 23; @@ -905,83 +913,83 @@ public class Widget extends Node { } if (this.type == 3) { - this.fill = var1.readUnsignedByte() == 1; + this.fill = buffer.readUnsignedByte() == 1; } if (this.type == 4 || this.type == 1) { - this.textXAlignment = var1.readUnsignedByte(); - this.textYAlignment = var1.readUnsignedByte(); - this.textLineHeight = var1.readUnsignedByte(); - this.fontId = var1.readUnsignedShort(); + this.textXAlignment = buffer.readUnsignedByte(); + this.textYAlignment = buffer.readUnsignedByte(); + this.textLineHeight = buffer.readUnsignedByte(); + this.fontId = buffer.readUnsignedShort(); if (this.fontId == 65535) { this.fontId = -1; } - this.textShadowed = var1.readUnsignedByte() == 1; + this.textShadowed = buffer.readUnsignedByte() == 1; } if (this.type == 4) { - this.text = var1.readStringCp1252NullTerminated(); - this.text2 = var1.readStringCp1252NullTerminated(); + this.text = buffer.readStringCp1252NullTerminated(); + this.text2 = buffer.readStringCp1252NullTerminated(); } if (this.type == 1 || this.type == 3 || this.type == 4) { - this.color = var1.readInt(); + this.color = buffer.readInt(); } if (this.type == 3 || this.type == 4) { - this.color2 = var1.readInt(); - this.mouseOverColor = var1.readInt(); - this.mouseOverColor2 = var1.readInt(); + this.color2 = buffer.readInt(); + this.mouseOverColor = buffer.readInt(); + this.mouseOverColor2 = buffer.readInt(); } if (this.type == 5) { - this.spriteId2 = var1.readInt(); - this.spriteId = var1.readInt(); + this.spriteId2 = buffer.readInt(); + this.spriteId = buffer.readInt(); } if (this.type == 6) { this.modelType = 1; - this.modelId = var1.readUnsignedShort(); + this.modelId = buffer.readUnsignedShort(); if (this.modelId == 65535) { this.modelId = -1; } this.modelType2 = 1; - this.modelId2 = var1.readUnsignedShort(); + this.modelId2 = buffer.readUnsignedShort(); if (this.modelId2 == 65535) { this.modelId2 = -1; } - this.sequenceId = var1.readUnsignedShort(); + this.sequenceId = buffer.readUnsignedShort(); if (this.sequenceId == 65535) { this.sequenceId = -1; } - this.sequenceId2 = var1.readUnsignedShort(); + this.sequenceId2 = buffer.readUnsignedShort(); if (this.sequenceId2 == 65535) { this.sequenceId2 = -1; } - this.modelZoom = var1.readUnsignedShort(); - this.modelAngleX = var1.readUnsignedShort(); - this.modelAngleY = var1.readUnsignedShort(); + this.modelZoom = buffer.readUnsignedShort(); + this.modelAngleX = buffer.readUnsignedShort(); + this.modelAngleY = buffer.readUnsignedShort(); } if (this.type == 7) { this.itemIds = new int[this.rawHeight * this.rawWidth]; this.itemQuantities = new int[this.rawWidth * this.rawHeight]; - this.textXAlignment = var1.readUnsignedByte(); - this.fontId = var1.readUnsignedShort(); + this.textXAlignment = buffer.readUnsignedByte(); + this.fontId = buffer.readUnsignedShort(); if (this.fontId == 65535) { this.fontId = -1; } - this.textShadowed = var1.readUnsignedByte() == 1; - this.color = var1.readInt(); - this.paddingX = var1.method44(); - this.paddingY = var1.method44(); - var4 = var1.readUnsignedByte(); + this.textShadowed = buffer.readUnsignedByte() == 1; + this.color = buffer.readInt(); + this.paddingX = buffer.method44(); + this.paddingY = buffer.method44(); + var4 = buffer.readUnsignedByte(); if (var4 == 1) { this.clickMask |= 1073741824; } @@ -989,7 +997,7 @@ public class Widget extends Node { this.itemActions = new String[5]; for (var5 = 0; var5 < 5; ++var5) { - String var10 = var1.readStringCp1252NullTerminated(); + String var10 = buffer.readStringCp1252NullTerminated(); if (var10.length() > 0) { this.itemActions[var5] = var10; this.clickMask |= 1 << var5 + 23; @@ -998,18 +1006,18 @@ public class Widget extends Node { } if (this.type == 8) { - this.text = var1.readStringCp1252NullTerminated(); + this.text = buffer.readStringCp1252NullTerminated(); } if (this.buttonType == 2 || this.type == 2) { - this.spellActionName = var1.readStringCp1252NullTerminated(); - this.spellName = var1.readStringCp1252NullTerminated(); - var4 = var1.readUnsignedShort() & 63; + this.spellActionName = buffer.readStringCp1252NullTerminated(); + this.spellName = buffer.readStringCp1252NullTerminated(); + var4 = buffer.readUnsignedShort() & 63; this.clickMask |= var4 << 11; } if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5 || this.buttonType == 6) { - this.buttonText = var1.readStringCp1252NullTerminated(); + this.buttonText = buffer.readStringCp1252NullTerminated(); if (this.buttonText.length() == 0) { if (this.buttonType == 1) { this.buttonText = "Ok"; @@ -1045,140 +1053,140 @@ public class Widget extends Node { garbageValue = "-1967445442" ) @Export("decode") - void decode(Buffer var1) { - var1.readUnsignedByte(); + void decode(Buffer buffer) { + buffer.readUnsignedByte(); this.isIf3 = true; - this.type = var1.readUnsignedByte(); - this.contentType = var1.readUnsignedShort(); - this.rawX = var1.method44(); - this.rawY = var1.method44(); - this.rawWidth = var1.readUnsignedShort(); + this.type = buffer.readUnsignedByte(); + this.contentType = buffer.readUnsignedShort(); + this.rawX = buffer.method44(); + this.rawY = buffer.method44(); + this.rawWidth = buffer.readUnsignedShort(); if (this.type == 9) { - this.rawHeight = var1.method44(); + this.rawHeight = buffer.method44(); } else { - this.rawHeight = var1.readUnsignedShort(); + this.rawHeight = buffer.readUnsignedShort(); } - this.widthAlignment = var1.readByte(); - this.heightAlignment = var1.readByte(); - this.xAlignment = var1.readByte(); - this.yAlignment = var1.readByte(); - this.parentId = var1.readUnsignedShort(); + this.widthAlignment = buffer.readByte(); + this.heightAlignment = buffer.readByte(); + this.xAlignment = buffer.readByte(); + this.yAlignment = buffer.readByte(); + this.parentId = buffer.readUnsignedShort(); if (this.parentId == 65535) { this.parentId = -1; } else { this.parentId += this.id & -65536; } - this.isHidden = var1.readUnsignedByte() == 1; + this.isHidden = buffer.readUnsignedByte() == 1; if (this.type == 0) { - this.scrollWidth = var1.readUnsignedShort(); - this.scrollHeight = var1.readUnsignedShort(); - this.noClickThrough = var1.readUnsignedByte() == 1; + this.scrollWidth = buffer.readUnsignedShort(); + this.scrollHeight = buffer.readUnsignedShort(); + this.noClickThrough = buffer.readUnsignedByte() == 1; } if (this.type == 5) { - this.spriteId2 = var1.readInt(); - this.spriteAngle = var1.readUnsignedShort(); - this.spriteTiling = var1.readUnsignedByte() == 1; - this.transparency = var1.readUnsignedByte(); - this.outline = var1.readUnsignedByte(); - this.spriteShadow = var1.readInt(); - this.spriteFlipV = var1.readUnsignedByte() == 1; - this.spriteFlipH = var1.readUnsignedByte() == 1; + this.spriteId2 = buffer.readInt(); + this.spriteAngle = buffer.readUnsignedShort(); + this.spriteTiling = buffer.readUnsignedByte() == 1; + this.transparency = buffer.readUnsignedByte(); + this.outline = buffer.readUnsignedByte(); + this.spriteShadow = buffer.readInt(); + this.spriteFlipV = buffer.readUnsignedByte() == 1; + this.spriteFlipH = buffer.readUnsignedByte() == 1; } if (this.type == 6) { this.modelType = 1; - this.modelId = var1.readUnsignedShort(); + this.modelId = buffer.readUnsignedShort(); if (this.modelId == 65535) { this.modelId = -1; } - this.modelOffsetX = var1.method44(); - this.modelOffsetY = var1.method44(); - this.modelAngleX = var1.readUnsignedShort(); - this.modelAngleY = var1.readUnsignedShort(); - this.modelAngleZ = var1.readUnsignedShort(); - this.modelZoom = var1.readUnsignedShort(); - this.sequenceId = var1.readUnsignedShort(); + this.modelOffsetX = buffer.method44(); + this.modelOffsetY = buffer.method44(); + this.modelAngleX = buffer.readUnsignedShort(); + this.modelAngleY = buffer.readUnsignedShort(); + this.modelAngleZ = buffer.readUnsignedShort(); + this.modelZoom = buffer.readUnsignedShort(); + this.sequenceId = buffer.readUnsignedShort(); if (this.sequenceId == 65535) { this.sequenceId = -1; } - this.modelOrthog = var1.readUnsignedByte() == 1; - var1.readUnsignedShort(); + this.modelOrthog = buffer.readUnsignedByte() == 1; + buffer.readUnsignedShort(); if (this.widthAlignment != 0) { - this.field962 = var1.readUnsignedShort(); + this.field962 = buffer.readUnsignedShort(); } if (this.heightAlignment != 0) { - var1.readUnsignedShort(); + buffer.readUnsignedShort(); } } if (this.type == 4) { - this.fontId = var1.readUnsignedShort(); + this.fontId = buffer.readUnsignedShort(); if (this.fontId == 65535) { this.fontId = -1; } - this.text = var1.readStringCp1252NullTerminated(); - this.textLineHeight = var1.readUnsignedByte(); - this.textXAlignment = var1.readUnsignedByte(); - this.textYAlignment = var1.readUnsignedByte(); - this.textShadowed = var1.readUnsignedByte() == 1; - this.color = var1.readInt(); + this.text = buffer.readStringCp1252NullTerminated(); + this.textLineHeight = buffer.readUnsignedByte(); + this.textXAlignment = buffer.readUnsignedByte(); + this.textYAlignment = buffer.readUnsignedByte(); + this.textShadowed = buffer.readUnsignedByte() == 1; + this.color = buffer.readInt(); } if (this.type == 3) { - this.color = var1.readInt(); - this.fill = var1.readUnsignedByte() == 1; - this.transparency = var1.readUnsignedByte(); + this.color = buffer.readInt(); + this.fill = buffer.readUnsignedByte() == 1; + this.transparency = buffer.readUnsignedByte(); } if (this.type == 9) { - this.lineWid = var1.readUnsignedByte(); - this.color = var1.readInt(); - this.field961 = var1.readUnsignedByte() == 1; + this.lineWid = buffer.readUnsignedByte(); + this.color = buffer.readInt(); + this.field961 = buffer.readUnsignedByte() == 1; } - this.clickMask = var1.readMedium(); - this.dataText = var1.readStringCp1252NullTerminated(); - int var2 = var1.readUnsignedByte(); + this.clickMask = buffer.readMedium(); + this.dataText = buffer.readStringCp1252NullTerminated(); + int var2 = buffer.readUnsignedByte(); if (var2 > 0) { this.actions = new String[var2]; for (int var3 = 0; var3 < var2; ++var3) { - this.actions[var3] = var1.readStringCp1252NullTerminated(); + this.actions[var3] = buffer.readStringCp1252NullTerminated(); } } - this.dragZoneSize = var1.readUnsignedByte(); - this.dragThreshold = var1.readUnsignedByte(); - this.isScrollBar = var1.readUnsignedByte() == 1; - this.spellActionName = var1.readStringCp1252NullTerminated(); - this.onLoad = this.readListener(var1); - this.onMouseOver = this.readListener(var1); - this.onMouseLeave = this.readListener(var1); - this.onTargetLeave = this.readListener(var1); - this.onTargetEnter = this.readListener(var1); - this.onVarTransmit = this.readListener(var1); - this.onInvTransmit = this.readListener(var1); - this.onStatTransmit = this.readListener(var1); - this.onTimer = this.readListener(var1); - this.onOp = this.readListener(var1); - this.onMouseRepeat = this.readListener(var1); - this.onClick = this.readListener(var1); - this.onClickRepeat = this.readListener(var1); - this.onRelease = this.readListener(var1); - this.onHold = this.readListener(var1); - this.onDrag = this.readListener(var1); - this.onDragComplete = this.readListener(var1); - this.onScroll = this.readListener(var1); - this.varTransmitTriggers = this.readListenerTriggers(var1); - this.invTransmitTriggers = this.readListenerTriggers(var1); - this.statTransmitTriggers = this.readListenerTriggers(var1); + this.dragZoneSize = buffer.readUnsignedByte(); + this.dragThreshold = buffer.readUnsignedByte(); + this.isScrollBar = buffer.readUnsignedByte() == 1; + this.spellActionName = buffer.readStringCp1252NullTerminated(); + this.onLoad = this.readListener(buffer); + this.onMouseOver = this.readListener(buffer); + this.onMouseLeave = this.readListener(buffer); + this.onTargetLeave = this.readListener(buffer); + this.onTargetEnter = this.readListener(buffer); + this.onVarTransmit = this.readListener(buffer); + this.onInvTransmit = this.readListener(buffer); + this.onStatTransmit = this.readListener(buffer); + this.onTimer = this.readListener(buffer); + this.onOp = this.readListener(buffer); + this.onMouseRepeat = this.readListener(buffer); + this.onClick = this.readListener(buffer); + this.onClickRepeat = this.readListener(buffer); + this.onRelease = this.readListener(buffer); + this.onHold = this.readListener(buffer); + this.onDrag = this.readListener(buffer); + this.onDragComplete = this.readListener(buffer); + this.onScroll = this.readListener(buffer); + this.varTransmitTriggers = this.readListenerTriggers(buffer); + this.invTransmitTriggers = this.readListenerTriggers(buffer); + this.statTransmitTriggers = this.readListenerTriggers(buffer); } @ObfuscatedName("g") @@ -1187,19 +1195,19 @@ public class Widget extends Node { garbageValue = "1906438788" ) @Export("readListener") - Object[] readListener(Buffer var1) { - int var2 = var1.readUnsignedByte(); + Object[] readListener(Buffer buffer) { + int var2 = buffer.readUnsignedByte(); if (var2 == 0) { return null; } else { Object[] var3 = new Object[var2]; for (int var4 = 0; var4 < var2; ++var4) { - int var5 = var1.readUnsignedByte(); + int var5 = buffer.readUnsignedByte(); if (var5 == 0) { - var3[var4] = new Integer(var1.readInt()); + var3[var4] = new Integer(buffer.readInt()); } else if (var5 == 1) { - var3[var4] = var1.readStringCp1252NullTerminated(); + var3[var4] = buffer.readStringCp1252NullTerminated(); } } @@ -1214,15 +1222,15 @@ public class Widget extends Node { garbageValue = "1" ) @Export("readListenerTriggers") - int[] readListenerTriggers(Buffer var1) { - int var2 = var1.readUnsignedByte(); + int[] readListenerTriggers(Buffer buffer) { + int var2 = buffer.readUnsignedByte(); if (var2 == 0) { return null; } else { int[] var3 = new int[var2]; for (int var4 = 0; var4 < var2; ++var4) { - var3[var4] = var1.readInt(); + var3[var4] = buffer.readInt(); } return var3; @@ -1235,13 +1243,13 @@ public class Widget extends Node { garbageValue = "1403134294" ) @Export("swapItems") - public void swapItems(int var1, int var2) { - int var3 = this.itemIds[var2]; - this.itemIds[var2] = this.itemIds[var1]; - this.itemIds[var1] = var3; - var3 = this.itemQuantities[var2]; - this.itemQuantities[var2] = this.itemQuantities[var1]; - this.itemQuantities[var1] = var3; + public void swapItems(int indexA, int indexB) { + int var3 = this.itemIds[indexB]; + this.itemIds[indexB] = this.itemIds[indexA]; + this.itemIds[indexA] = var3; + var3 = this.itemQuantities[indexB]; + this.itemQuantities[indexB] = this.itemQuantities[indexA]; + this.itemQuantities[indexA] = var3; } @ObfuscatedName("x") @@ -1318,7 +1326,7 @@ public class Widget extends Node { if (var1 != null) { return var1; } else { - var1 = SpriteIds.method5823(field955, class27.field1143, this.fontId, 0); + var1 = GraphicsDefaults.method5823(field955, class27.field1143, this.fontId, 0); if (var1 != null) { Widget_cachedFonts.put(var1, (long)this.fontId); } else { @@ -1368,7 +1376,7 @@ public class Widget extends Node { garbageValue = "1082545676" ) @Export("getModel") - public Model getModel(SequenceDefinition var1, int var2, boolean var3, PlayerAppearance var4) { + public Model getModel(SequenceDefinition sequence, int frame, boolean var3, PlayerAppearance appearance) { field957 = false; int var5; int var6; @@ -1409,11 +1417,11 @@ public class Widget extends Node { } if (var5 == 3) { - if (var4 == null) { + if (appearance == null) { return null; } - var8 = var4.getModelData(); + var8 = appearance.getModelData(); if (var8 == null) { field957 = true; return null; @@ -1436,8 +1444,8 @@ public class Widget extends Node { Widget_cachedModels.put(var7, (long)(var6 + (var5 << 16))); } - if (var1 != null) { - var7 = var1.animateWidget(var7, var2); + if (sequence != null) { + var7 = sequence.animateWidget(var7, frame); } return var7; @@ -1509,9 +1517,9 @@ public class Widget extends Node { garbageValue = "-30" ) @Export("setAction") - public void setAction(int var1, String var2) { - if (this.actions == null || this.actions.length <= var1) { - String[] var3 = new String[var1 + 1]; + public void setAction(int index, String var2) { + if (this.actions == null || this.actions.length <= index) { + String[] var3 = new String[index + 1]; if (this.actions != null) { for (int var4 = 0; var4 < this.actions.length; ++var4) { var3[var4] = this.actions[var4]; @@ -1521,7 +1529,7 @@ public class Widget extends Node { this.actions = var3; } - this.actions[var1] = var2; + this.actions[index] = var2; } @ObfuscatedName("m") @@ -1529,27 +1537,27 @@ public class Widget extends Node { signature = "(I[BLff;I)V", garbageValue = "-1287305716" ) - static void method4499(int var0, byte[] var1, IndexStore var2) { - IndexStoreAction var3 = new IndexStoreAction(); + static void method4499(int var0, byte[] var1, ArchiveDisk var2) { + ArchiveDiskAction var3 = new ArchiveDiskAction(); var3.type = 0; var3.key = (long)var0; var3.data = var1; - var3.indexStore = var2; - NodeDeque var4 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue; - synchronized(IndexStoreActionHandler.IndexStoreActionHandler_requestQueue) { - IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.addFirst(var3); + var3.archiveDisk = var2; + NodeDeque var4 = ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); } - Object var5 = IndexStoreActionHandler.IndexStoreActionHandler_lock; - synchronized(IndexStoreActionHandler.IndexStoreActionHandler_lock) { - if (IndexStoreActionHandler.field412 == 0) { - Frames.IndexStoreActionHandler_thread = new Thread(new IndexStoreActionHandler()); - Frames.IndexStoreActionHandler_thread.setDaemon(true); - Frames.IndexStoreActionHandler_thread.start(); - Frames.IndexStoreActionHandler_thread.setPriority(5); + Object var5 = ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { + if (ArchiveDiskActionHandler.field412 == 0) { + Frames.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); + Frames.ArchiveDiskActionHandler_thread.setDaemon(true); + Frames.ArchiveDiskActionHandler_thread.start(); + Frames.ArchiveDiskActionHandler_thread.setPriority(5); } - IndexStoreActionHandler.field412 = 600; + ArchiveDiskActionHandler.field412 = 600; } } diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java index 323886684a..2de1441c4f 100644 --- a/runescape-client/src/main/java/WorldMap.java +++ b/runescape-client/src/main/java/WorldMap.java @@ -35,17 +35,17 @@ public class WorldMap { @ObfuscatedSignature( signature = "Lir;" ) - AbstractIndexCache field989; + AbstractArchive field989; @ObfuscatedName("l") @ObfuscatedSignature( signature = "Lir;" ) - AbstractIndexCache field990; + AbstractArchive field990; @ObfuscatedName("e") @ObfuscatedSignature( signature = "Lir;" ) - AbstractIndexCache field991; + AbstractArchive field991; @ObfuscatedName("n") @ObfuscatedSignature( signature = "Lkk;" @@ -74,8 +74,8 @@ public class WorldMap { @ObfuscatedSignature( signature = "Lag;" ) - @Export("currentMapArea0") - WorldMapArea currentMapArea0; + @Export("currentMapArea") + WorldMapArea currentMapArea; @ObfuscatedName("t") @ObfuscatedSignature( signature = "Lag;" @@ -92,7 +92,7 @@ public class WorldMap { signature = "Lls;" ) @Export("cacheLoader") - WorldMapIndexCacheLoader cacheLoader; + WorldMapArchiveLoader cacheLoader; @ObfuscatedName("b") @ObfuscatedGetter( intValue = 1711576969 @@ -158,8 +158,8 @@ public class WorldMap { ) int field994; @ObfuscatedName("ah") - @Export("perpetualFlash0") - boolean perpetualFlash0; + @Export("perpetualFlash") + boolean perpetualFlash; @ObfuscatedName("ak") @Export("flashingElements") HashSet flashingElements; @@ -242,7 +242,7 @@ public class WorldMap { signature = "Lhu;" ) @Export("mouseCoord") - TileLocation mouseCoord; + Coord mouseCoord; @ObfuscatedName("bc") @Export("showCoord") public boolean showCoord; @@ -282,7 +282,7 @@ public class WorldMap { this.worldMapDisplayY = -1; this.field993 = 3; this.field994 = 50; - this.perpetualFlash0 = false; + this.perpetualFlash = false; this.flashingElements = null; this.field995 = -1; this.field996 = -1; @@ -312,7 +312,7 @@ public class WorldMap { garbageValue = "1887817097" ) @Export("init") - public void init(AbstractIndexCache var1, AbstractIndexCache var2, AbstractIndexCache var3, Font var4, HashMap var5, IndexedSprite[] var6) { + public void init(AbstractArchive var1, AbstractArchive var2, AbstractArchive var3, Font var4, HashMap var5, IndexedSprite[] var6) { this.mapSceneSprites = var6; this.field989 = var1; this.field990 = var2; @@ -322,13 +322,13 @@ public class WorldMap { this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_small, var5.get(fontNameVerdana11)); this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_medium, var5.get(fontNameVerdana13)); this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_large, var5.get(fontNameVerdana15)); - this.cacheLoader = new WorldMapIndexCacheLoader(var1); - int var7 = this.field989.getArchiveId(WorldMapCacheName.WorldMapCacheName_details.name); + this.cacheLoader = new WorldMapArchiveLoader(var1); + int var7 = this.field989.getGroupId(WorldMapCacheName.WorldMapCacheName_details.name); int[] var8 = this.field989.method3(var7); this.mapAreas = new HashMap(var8.length); for (int var9 = 0; var9 < var8.length; ++var9) { - Buffer var10 = new Buffer(this.field989.takeRecord(var7, var8[var9])); + Buffer var10 = new Buffer(this.field989.takeFile(var7, var8[var9])); WorldMapArea var11 = new WorldMapArea(); var11.read(var10, var8[var9]); this.mapAreas.put(var11.archiveName(), var11); @@ -357,7 +357,7 @@ public class WorldMap { ) @Export("onCycle") public void onCycle(int var1, int var2, boolean var3, int var4, int var5, int var6, int var7) { - if (this.cacheLoader.isLoaded()) { + if (this.cacheLoader.getIsLoaded()) { this.smoothZoom(); this.method363(); if (var3) { @@ -370,11 +370,11 @@ public class WorldMap { AbstractWorldMapIcon var13; ScriptEvent var14; WorldMapEvent var15; - for (var12 = var10.iterator(); var12.hasNext(); AbstractIndexCache.runScript(var14)) { + for (var12 = var10.iterator(); var12.hasNext(); AbstractArchive.runScript(var14)) { var13 = (AbstractWorldMapIcon)var12.next(); var11.add(var13); var14 = new ScriptEvent(); - var15 = new WorldMapEvent(var13.vmethod395(), var13.coord1, var13.coord2); + var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); var14.setArgs(new Object[]{var15, var1, var2}); if (this.field1010.contains(var13)) { var14.setType(17); @@ -389,10 +389,10 @@ public class WorldMap { var13 = (AbstractWorldMapIcon)var12.next(); if (!var11.contains(var13)) { var14 = new ScriptEvent(); - var15 = new WorldMapEvent(var13.vmethod395(), var13.coord1, var13.coord2); + var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); var14.setArgs(new Object[]{var15, var1, var2}); var14.setType(16); - AbstractIndexCache.runScript(var14); + AbstractArchive.runScript(var14); } } @@ -437,38 +437,38 @@ public class WorldMap { @ObfuscatedName("o") void method362(int var1, int var2, boolean var3, long var4) { - if (this.currentMapArea0 != null) { - int var6 = (int)((float)this.worldMapX + ((float)(var1 - this.worldMapDisplayX) - (float)this.method377() * this.zoom / 2.0F) / this.zoom); - int var7 = (int)((float)this.worldMapY - ((float)(var2 - this.worldMapDisplayY) - (float)this.method378() * this.zoom / 2.0F) / this.zoom); - this.mouseCoord = this.currentMapArea0.coord(var6 + this.currentMapArea0.minX() * 64, var7 + this.currentMapArea0.minY() * 64); + if (this.currentMapArea != null) { + int var6 = (int)((float)this.worldMapX + ((float)(var1 - this.worldMapDisplayX) - (float)this.getDisplayWith() * this.zoom / 2.0F) / this.zoom); + int var7 = (int)((float)this.worldMapY - ((float)(var2 - this.worldMapDisplayY) - (float)this.getDisplayHeight() * this.zoom / 2.0F) / this.zoom); + this.mouseCoord = this.currentMapArea.coord(var6 + this.currentMapArea.minX() * 64, var7 + this.currentMapArea.minY() * 64); if (this.mouseCoord != null && var3) { int var8; int var9; - PacketBufferNode var11; + PacketBufferNode var10; if (FriendSystem.jmodCheck() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { int var12 = this.mouseCoord.x; var8 = this.mouseCoord.y; var9 = this.mouseCoord.plane; - var11 = Interpreter.method1915(ClientPacket.field283, Client.packetWriter.isaacCipher); - var11.packetBuffer.writeIntME(0); - var11.packetBuffer.writeShortLE(var8); - var11.packetBuffer.method56(var9); - var11.packetBuffer.writeShort(var12); - Client.packetWriter.method241(var11); + var10 = Interpreter.method1915(ClientPacket.field283, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeIntME(0); + var10.packetBuffer.writeShortLE(var8); + var10.packetBuffer.method56(var9); + var10.packetBuffer.writeShort(var12); + Client.packetWriter.method241(var10); } else { - boolean var10 = true; + boolean var11 = true; if (this.field1004) { var8 = var1 - this.field1002; var9 = var2 - this.field1003; if (var4 - this.field1001 > 500L || var8 < -25 || var8 > 25 || var9 < -25 || var9 > 25) { - var10 = false; + var11 = false; } } - if (var10) { - var11 = Interpreter.method1915(ClientPacket.field267, Client.packetWriter.isaacCipher); - var11.packetBuffer.writeIntME(this.mouseCoord.packed()); - Client.packetWriter.method241(var11); + if (var11) { + var10 = Interpreter.method1915(ClientPacket.field267, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeIntME(this.mouseCoord.packed()); + Client.packetWriter.method241(var10); this.field1001 = 0L; } } @@ -569,17 +569,19 @@ public class WorldMap { garbageValue = "1738506455" ) @Export("mapAreaAtCoord") - public WorldMapArea mapAreaAtCoord(int var1, int var2, int var3) { + public WorldMapArea mapAreaAtCoord(int plane, int x, int y) { Iterator var4 = this.mapAreas.values().iterator(); - while (var4.hasNext()) { - WorldMapArea var5 = (WorldMapArea)var4.next(); - if (var5.containsCoord(var1, var2, var3)) { - return var5; + WorldMapArea var5; + do { + if (!var4.hasNext()) { + return null; } - } - return null; + var5 = (WorldMapArea)var4.next(); + } while(!var5.containsCoord(plane, x, y)); + + return var5; } @ObfuscatedName("a") @@ -631,7 +633,7 @@ public class WorldMap { ) @Export("currentMapAreaId") public int currentMapAreaId() { - return this.currentMapArea0 == null ? -1 : this.currentMapArea0.id(); + return this.currentMapArea == null ? -1 : this.currentMapArea.id(); } @ObfuscatedName("s") @@ -641,7 +643,7 @@ public class WorldMap { ) @Export("getCurrentMapArea") public WorldMapArea getCurrentMapArea() { - return this.currentMapArea0; + return this.currentMapArea; } @ObfuscatedName("t") @@ -650,9 +652,9 @@ public class WorldMap { garbageValue = "-44" ) @Export("setCurrentMapArea") - void setCurrentMapArea(WorldMapArea var1) { - if (this.currentMapArea0 == null || var1 != this.currentMapArea0) { - this.initializeWorldMap(var1); + void setCurrentMapArea(WorldMapArea mapArea) { + if (this.currentMapArea == null || mapArea != this.currentMapArea) { + this.initializeWorldMapManager(mapArea); this.jump(-1, -1, -1); } @@ -663,11 +665,11 @@ public class WorldMap { signature = "(Lag;I)V", garbageValue = "-1072205896" ) - @Export("initializeWorldMap") - void initializeWorldMap(WorldMapArea var1) { - this.currentMapArea0 = var1; + @Export("initializeWorldMapManager") + void initializeWorldMapManager(WorldMapArea mapArea) { + this.currentMapArea = mapArea; this.worldMapManager = new WorldMapManager(this.mapSceneSprites, this.fonts, this.field990, this.field991); - this.cacheLoader.reset(this.currentMapArea0.archiveName()); + this.cacheLoader.reset(this.currentMapArea.archiveName()); } @ObfuscatedName("h") @@ -675,13 +677,13 @@ public class WorldMap { signature = "(Lag;Lhu;Lhu;ZI)V", garbageValue = "-1430939646" ) - public void method367(WorldMapArea var1, TileLocation var2, TileLocation var3, boolean var4) { + public void method367(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { if (var1 != null) { - if (this.currentMapArea0 == null || var1 != this.currentMapArea0) { - this.initializeWorldMap(var1); + if (this.currentMapArea == null || var1 != this.currentMapArea) { + this.initializeWorldMapManager(var1); } - if (!var4 && this.currentMapArea0.containsCoord(var2.plane, var2.x, var2.y)) { + if (!var4 && this.currentMapArea.containsCoord(var2.plane, var2.x, var2.y)) { this.jump(var2.plane, var2.x, var2.y); } else { this.jump(var3.plane, var3.x, var3.y); @@ -696,17 +698,17 @@ public class WorldMap { garbageValue = "1094346962" ) @Export("jump") - void jump(int var1, int var2, int var3) { - if (this.currentMapArea0 != null) { - int[] var4 = this.currentMapArea0.position(var1, var2, var3); + void jump(int plane, int x, int y) { + if (this.currentMapArea != null) { + int[] var4 = this.currentMapArea.position(plane, x, y); if (var4 == null) { - var4 = this.currentMapArea0.position(this.currentMapArea0.originPlane(), this.currentMapArea0.originX(), this.currentMapArea0.originY()); + var4 = this.currentMapArea.position(this.currentMapArea.originPlane(), this.currentMapArea.originX(), this.currentMapArea.originY()); } - this.setWorldMapPosition(var4[0] - this.currentMapArea0.minX() * 64, var4[1] - this.currentMapArea0.minY() * 64, true); + this.setWorldMapPosition(var4[0] - this.currentMapArea.minX() * 64, var4[1] - this.currentMapArea.minY() * 64, true); this.worldMapTargetX = -1; this.worldMapTargetY = -1; - this.zoom = this.method370(this.currentMapArea0.zoom()); + this.zoom = this.method370(this.currentMapArea.zoom()); this.zoomTarget = this.zoom; this.field1009 = null; this.iconIterator = null; @@ -721,17 +723,17 @@ public class WorldMap { garbageValue = "-288419793" ) @Export("draw") - public void draw(int var1, int var2, int var3, int var4, int var5) { + public void draw(int x, int y, int width, int height, int cycle) { int[] var6 = new int[4]; Rasterizer2D.Rasterizer2D_getClipArray(var6); - Rasterizer2D.Rasterizer2D_setClip(var1, var2, var3 + var1, var2 + var4); - Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); - int var7 = this.cacheLoader.percentLoaded(); + Rasterizer2D.Rasterizer2D_setClip(x, y, width + x, y + height); + Rasterizer2D.Rasterizer2D_fillRectangle(x, y, width, height, -16777216); + int var7 = this.cacheLoader.getPercentLoaded(); if (var7 < 100) { - this.drawLoading(var1, var2, var3, var4, var7); + this.drawLoading(x, y, width, height, var7); } else { if (!this.worldMapManager.isLoaded()) { - this.worldMapManager.load(this.field989, this.currentMapArea0.archiveName(), Client.isMembersWorld); + this.worldMapManager.load(this.field989, this.currentMapArea.archiveName(), Client.isMembersWorld); if (!this.worldMapManager.isLoaded()) { return; } @@ -744,33 +746,33 @@ public class WorldMap { ++this.field995; } - if (this.field995 >= this.field993 && !this.perpetualFlash0) { + if (this.field995 >= this.field993 && !this.perpetualFlash) { this.flashingElements = null; } } - int var8 = (int)Math.ceil((double)((float)var3 / this.zoom)); - int var9 = (int)Math.ceil((double)((float)var4 / this.zoom)); - this.worldMapManager.method401(this.worldMapX - var8 / 2, this.worldMapY - var9 / 2, var8 / 2 + this.worldMapX, var9 / 2 + this.worldMapY, var1, var2, var3 + var1, var2 + var4); + int var8 = (int)Math.ceil((double)((float)width / this.zoom)); + int var9 = (int)Math.ceil((double)((float)height / this.zoom)); + this.worldMapManager.method401(this.worldMapX - var8 / 2, this.worldMapY - var9 / 2, var8 / 2 + this.worldMapX, var9 / 2 + this.worldMapY, x, y, width + x, y + height); if (!this.elementsDisabled) { boolean var10 = false; - if (var5 - this.field1007 > 100) { - this.field1007 = var5; + if (cycle - this.field1007 > 100) { + this.field1007 = cycle; var10 = true; } - this.worldMapManager.method402(this.worldMapX - var8 / 2, this.worldMapY - var9 / 2, var8 / 2 + this.worldMapX, var9 / 2 + this.worldMapY, var1, var2, var3 + var1, var2 + var4, this.field1006, this.flashingElements, this.field996, this.field994, var10); + this.worldMapManager.method402(this.worldMapX - var8 / 2, this.worldMapY - var9 / 2, var8 / 2 + this.worldMapX, var9 / 2 + this.worldMapY, x, y, width + x, y + height, this.field1006, this.flashingElements, this.field996, this.field994, var10); } - this.method369(var1, var2, var3, var4, var8, var9); + this.method369(x, y, width, height, var8, var9); if (FriendSystem.jmodCheck() && this.showCoord && this.mouseCoord != null) { this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 16776960, -1); } this.worldMapDisplayWidth = var8; this.worldMapDisplayHeight = var9; - this.worldMapDisplayX = var1; - this.worldMapDisplayY = var2; + this.worldMapDisplayX = x; + this.worldMapDisplayY = y; Rasterizer2D.Rasterizer2D_setClipArray(var6); } @@ -798,8 +800,8 @@ public class WorldMap { float var10 = 1.0F; var8 = (int)((float)var8 / var10); var9 = (int)((float)var9 / var10); - int var11 = this.method374() - var5 / 2 - var7; - int var12 = this.method375() - var6 / 2 - var7; + int var11 = this.getDisplayX() - var5 / 2 - var7; + int var12 = this.getDisplayY() - var6 / 2 - var7; int var13 = var1 - (var7 + var11 - this.field1012) * this.worldMapManager.field1050; int var14 = var2 - this.worldMapManager.field1050 * (var7 - (var12 - this.field1013)); if (this.method368(var8, var9, var13, var14, var3, var4)) { @@ -809,8 +811,8 @@ public class WorldMap { this.sprite = new Sprite(var8, var9); } - this.field1012 = this.method374() - var5 / 2 - var7; - this.field1013 = this.method375() - var6 / 2 - var7; + this.field1012 = this.getDisplayX() - var5 / 2 - var7; + this.field1013 = this.getDisplayY() - var6 / 2 - var7; this.field1011 = this.worldMapManager.field1050; ClientParameter.field3645.method4720(this.field1012, this.field1013, this.sprite, (float)this.field1011 / var10); this.field1014 = Client.field104; @@ -834,16 +836,16 @@ public class WorldMap { garbageValue = "-84" ) @Export("drawOverview") - public void drawOverview(int var1, int var2, int var3, int var4) { - if (this.cacheLoader.isLoaded()) { + public void drawOverview(int x, int y, int width, int height) { + if (this.cacheLoader.getIsLoaded()) { if (!this.worldMapManager.isLoaded()) { - this.worldMapManager.load(this.field989, this.currentMapArea0.archiveName(), Client.isMembersWorld); + this.worldMapManager.load(this.field989, this.currentMapArea.archiveName(), Client.isMembersWorld); if (!this.worldMapManager.isLoaded()) { return; } } - this.worldMapManager.drawOverview(var1, var2, var3, var4, this.flashingElements, this.field996, this.field994); + this.worldMapManager.drawOverview(x, y, width, height, this.flashingElements, this.field996, this.field994); } } @@ -854,8 +856,8 @@ public class WorldMap { garbageValue = "328502073" ) @Export("setZoomLevel") - public void setZoomLevel(int var1) { - this.zoomTarget = this.method370(var1); + public void setZoomLevel(int zoom) { + this.zoomTarget = this.method370(zoom); } @ObfuscatedName("aj") @@ -910,7 +912,7 @@ public class WorldMap { ) @Export("isCacheLoaded") public boolean isCacheLoaded() { - return this.cacheLoader.isLoaded(); + return this.cacheLoader.getIsLoaded(); } @ObfuscatedName("ah") @@ -922,14 +924,16 @@ public class WorldMap { public WorldMapArea getMapArea(int var1) { Iterator var2 = this.mapAreas.values().iterator(); - while (var2.hasNext()) { - WorldMapArea var3 = (WorldMapArea)var2.next(); - if (var3.id() == var1) { - return var3; + WorldMapArea var3; + do { + if (!var2.hasNext()) { + return null; } - } - return null; + var3 = (WorldMapArea)var2.next(); + } while(var3.id() != var1); + + return var3; } @ObfuscatedName("ak") @@ -938,10 +942,10 @@ public class WorldMap { garbageValue = "1820000123" ) @Export("setWorldMapPositionTarget") - public void setWorldMapPositionTarget(int var1, int var2) { - if (this.currentMapArea0 != null && this.currentMapArea0.containsPosition(var1, var2)) { - this.worldMapTargetX = var1 - this.currentMapArea0.minX() * 64; - this.worldMapTargetY = var2 - this.currentMapArea0.minY() * 64; + public void setWorldMapPositionTarget(int x, int y) { + if (this.currentMapArea != null && this.currentMapArea.containsPosition(x, y)) { + this.worldMapTargetX = x - this.currentMapArea.minX() * 64; + this.worldMapTargetY = y - this.currentMapArea.minY() * 64; } } @@ -951,9 +955,10 @@ public class WorldMap { signature = "(III)V", garbageValue = "-2147142500" ) - public void method371(int var1, int var2) { - if (this.currentMapArea0 != null) { - this.setWorldMapPosition(var1 - this.currentMapArea0.minX() * 64, var2 - this.currentMapArea0.minY() * 64, true); + @Export("setWorldMapPositionTargetInstant") + public void setWorldMapPositionTargetInstant(int x, int y) { + if (this.currentMapArea != null) { + this.setWorldMapPosition(x - this.currentMapArea.minX() * 64, y - this.currentMapArea.minY() * 64, true); this.worldMapTargetX = -1; this.worldMapTargetY = -1; } @@ -965,9 +970,10 @@ public class WorldMap { signature = "(IIIB)V", garbageValue = "-40" ) - public void method372(int var1, int var2, int var3) { - if (this.currentMapArea0 != null) { - int[] var4 = this.currentMapArea0.position(var1, var2, var3); + @Export("jumpToSourceCoord") + public void jumpToSourceCoord(int plane, int x, int y) { + if (this.currentMapArea != null) { + int[] var4 = this.currentMapArea.position(plane, x, y); if (var4 != null) { this.setWorldMapPositionTarget(var4[0], var4[1]); } @@ -980,11 +986,12 @@ public class WorldMap { signature = "(IIII)V", garbageValue = "1808854561" ) - public void method373(int var1, int var2, int var3) { - if (this.currentMapArea0 != null) { - int[] var4 = this.currentMapArea0.position(var1, var2, var3); + @Export("jumpToSourceCoordInstant") + public void jumpToSourceCoordInstant(int plane, int x, int y) { + if (this.currentMapArea != null) { + int[] var4 = this.currentMapArea.position(plane, x, y); if (var4 != null) { - this.method371(var4[0], var4[1]); + this.setWorldMapPositionTargetInstant(var4[0], var4[1]); } } @@ -995,8 +1002,9 @@ public class WorldMap { signature = "(I)I", garbageValue = "-659556919" ) - public int method374() { - return this.currentMapArea0 == null ? -1 : this.worldMapX + this.currentMapArea0.minX() * 64; + @Export("getDisplayX") + public int getDisplayX() { + return this.currentMapArea == null ? -1 : this.worldMapX + this.currentMapArea.minX() * 64; } @ObfuscatedName("at") @@ -1004,8 +1012,9 @@ public class WorldMap { signature = "(I)I", garbageValue = "1893257871" ) - public int method375() { - return this.currentMapArea0 == null ? -1 : this.worldMapY + this.currentMapArea0.minY() * 64; + @Export("getDisplayY") + public int getDisplayY() { + return this.currentMapArea == null ? -1 : this.worldMapY + this.currentMapArea.minY() * 64; } @ObfuscatedName("ad") @@ -1013,8 +1022,9 @@ public class WorldMap { signature = "(I)Lhu;", garbageValue = "-2005824064" ) - public TileLocation method376() { - return this.currentMapArea0 == null ? null : this.currentMapArea0.coord(this.method374(), this.method375()); + @Export("getDisplayCoord") + public Coord getDisplayCoord() { + return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); } @ObfuscatedName("ap") @@ -1022,7 +1032,8 @@ public class WorldMap { signature = "(I)I", garbageValue = "442119278" ) - public int method377() { + @Export("getDisplayWith") + public int getDisplayWith() { return this.worldMapDisplayWidth; } @@ -1031,7 +1042,8 @@ public class WorldMap { signature = "(I)I", garbageValue = "-2065910749" ) - public int method378() { + @Export("getDisplayHeight") + public int getDisplayHeight() { return this.worldMapDisplayHeight; } @@ -1082,9 +1094,9 @@ public class WorldMap { signature = "(ZI)V", garbageValue = "1025207933" ) - @Export("perpetualFlash") - public void perpetualFlash(boolean var1) { - this.perpetualFlash0 = var1; + @Export("setPerpetualFlash") + public void setPerpetualFlash(boolean var1) { + this.perpetualFlash = var1; } @ObfuscatedName("aa") @@ -1229,7 +1241,7 @@ public class WorldMap { garbageValue = "-73" ) public void method384(int var1, int var2, int var3, int var4, int var5, int var6) { - if (this.cacheLoader.isLoaded()) { + if (this.cacheLoader.getIsLoaded()) { int var7 = (int)Math.ceil((double)((float)var3 / this.zoom)); int var8 = (int)Math.ceil((double)((float)var4 / this.zoom)); List var9 = this.worldMapManager.method403(this.worldMapX - var7 / 2 - 1, this.worldMapY - var8 / 2 - 1, var7 / 2 + this.worldMapX + 1, var8 / 2 + this.worldMapY + 1, var1, var2, var3, var4, var5, var6); @@ -1243,12 +1255,12 @@ public class WorldMap { } AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var10.next(); - WorldMapElement var13 = ViewportMouse.getWorldMapElement(var12.vmethod395()); + WorldMapElement var13 = ViewportMouse.getWorldMapElement(var12.getElement()); var11 = false; for (int var14 = this.field1008.length - 1; var14 >= 0; --var14) { if (var13.strings[var14] != null) { - Tiles.insertMenuItemNoShift(var13.strings[var14], var13.string1, this.field1008[var14], var12.vmethod395(), var12.coord1.packed(), var12.coord2.packed()); + Tiles.insertMenuItemNoShift(var13.strings[var14], var13.string1, this.field1008[var14], var12.getElement(), var12.coord1.packed(), var12.coord2.packed()); var11 = true; } } @@ -1263,12 +1275,12 @@ public class WorldMap { signature = "(ILhu;I)Lhu;", garbageValue = "333454230" ) - public TileLocation method385(int var1, TileLocation var2) { - if (!this.cacheLoader.isLoaded()) { + public Coord method385(int var1, Coord var2) { + if (!this.cacheLoader.getIsLoaded()) { return null; } else if (!this.worldMapManager.isLoaded()) { return null; - } else if (!this.currentMapArea0.containsPosition(var2.x, var2.y)) { + } else if (!this.currentMapArea.containsPosition(var2.x, var2.y)) { return null; } else { HashMap var3 = this.worldMapManager.buildIcons(); @@ -1278,22 +1290,26 @@ public class WorldMap { int var6 = -1; Iterator var7 = var4.iterator(); - while (var7.hasNext()) { - AbstractWorldMapIcon var8 = (AbstractWorldMapIcon)var7.next(); - int var10 = var8.coord2.x - var2.x; - int var11 = var8.coord2.y - var2.y; - int var9 = var11 * var11 + var10 * var10; - if (var9 == 0) { - return var8.coord2; - } + while (true) { + AbstractWorldMapIcon var8; + int var11; + do { + if (!var7.hasNext()) { + return var5.coord2; + } - if (var9 < var6 || var5 == null) { - var5 = var8; - var6 = var9; - } + var8 = (AbstractWorldMapIcon)var7.next(); + int var9 = var8.coord2.x - var2.x; + int var10 = var8.coord2.y - var2.y; + var11 = var10 * var10 + var9 * var9; + if (var11 == 0) { + return var8.coord2; + } + } while(var11 >= var6 && var5 != null); + + var5 = var8; + var6 = var11; } - - return var5.coord2; } else { return null; } @@ -1306,7 +1322,7 @@ public class WorldMap { garbageValue = "94" ) @Export("menuAction") - public void menuAction(int var1, int var2, TileLocation var3, TileLocation var4) { + public void menuAction(int var1, int var2, Coord var3, Coord var4) { ScriptEvent var5 = new ScriptEvent(); WorldMapEvent var6 = new WorldMapEvent(var2, var3, var4); var5.setArgs(new Object[]{var6}); @@ -1327,7 +1343,7 @@ public class WorldMap { var5.setType(14); } - AbstractIndexCache.runScript(var5); + AbstractArchive.runScript(var5); } @ObfuscatedName("bx") @@ -1337,7 +1353,7 @@ public class WorldMap { ) @Export("iconStart") public AbstractWorldMapIcon iconStart() { - if (!this.cacheLoader.isLoaded()) { + if (!this.cacheLoader.getIsLoaded()) { return null; } else if (!this.worldMapManager.isLoaded()) { return null; @@ -1366,14 +1382,16 @@ public class WorldMap { if (this.iconIterator == null) { return null; } else { - while (this.iconIterator.hasNext()) { - AbstractWorldMapIcon var1 = (AbstractWorldMapIcon)this.iconIterator.next(); - if (var1.vmethod395() != -1) { - return var1; + AbstractWorldMapIcon var1; + do { + if (!this.iconIterator.hasNext()) { + return null; } - } - return null; + var1 = (AbstractWorldMapIcon)this.iconIterator.next(); + } while(var1.getElement() == -1); + + return var1; } } diff --git a/runescape-client/src/main/java/WorldMapArchiveLoader.java b/runescape-client/src/main/java/WorldMapArchiveLoader.java new file mode 100644 index 0000000000..0240307fe8 --- /dev/null +++ b/runescape-client/src/main/java/WorldMapArchiveLoader.java @@ -0,0 +1,108 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ls") +@Implements("WorldMapArchiveLoader") +public class WorldMapArchiveLoader { + @ObfuscatedName("o") + @Export("cacheName") + String cacheName; + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "Lir;" + ) + @Export("archive") + AbstractArchive archive; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 624113115 + ) + @Export("percentLoaded") + int percentLoaded; + @ObfuscatedName("l") + @Export("isLoaded") + boolean isLoaded; + + @ObfuscatedSignature( + signature = "(Lir;)V" + ) + WorldMapArchiveLoader(AbstractArchive var1) { + this.percentLoaded = 0; + this.isLoaded = false; + this.archive = var1; + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)V", + garbageValue = "-1867776989" + ) + @Export("reset") + void reset(String cacheName) { + if (cacheName != null && !cacheName.isEmpty() && cacheName != this.cacheName) { + this.cacheName = cacheName; + this.percentLoaded = 0; + this.isLoaded = false; + this.load(); + } + + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "2019633217" + ) + @Export("load") + int load() { + if (this.percentLoaded < 33) { + if (!this.archive.tryLoadFileByNames(WorldMapCacheName.WorldMapCacheName_compositeMap.name, this.cacheName)) { + return this.percentLoaded; + } + + this.percentLoaded = 33; + } + + if (this.percentLoaded == 33) { + if (this.archive.method9(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, this.cacheName)) { + return this.percentLoaded; + } + + this.percentLoaded = 66; + } + + if (this.percentLoaded == 66) { + if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.WorldMapCacheName_labels.name)) { + return this.percentLoaded; + } + + this.percentLoaded = 100; + this.isLoaded = true; + } + + return this.percentLoaded; + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "(S)Z", + garbageValue = "-16324" + ) + @Export("getIsLoaded") + boolean getIsLoaded() { + return this.isLoaded; + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "1342963007" + ) + @Export("getPercentLoaded") + int getPercentLoaded() { + return this.percentLoaded; + } +} diff --git a/runescape-client/src/main/java/WorldMapArea.java b/runescape-client/src/main/java/WorldMapArea.java index 0d20341aaa..a7c2416d34 100644 --- a/runescape-client/src/main/java/WorldMapArea.java +++ b/runescape-client/src/main/java/WorldMapArea.java @@ -49,7 +49,7 @@ public class WorldMapArea { signature = "Lhu;" ) @Export("origin0") - TileLocation origin0; + Coord origin0; @ObfuscatedName("g") @ObfuscatedGetter( intValue = 1238532539 @@ -103,7 +103,7 @@ public class WorldMapArea { this.id0 = var2; this.archiveName0 = var1.readStringCp1252NullTerminated(); this.name0 = var1.readStringCp1252NullTerminated(); - this.origin0 = new TileLocation(var1.readInt()); + this.origin0 = new Coord(var1.readInt()); this.field1015 = var1.readInt(); var1.readUnsignedByte(); this.isMain0 = var1.readUnsignedByte() == 1; @@ -156,17 +156,19 @@ public class WorldMapArea { garbageValue = "1843012457" ) @Export("containsCoord") - public boolean containsCoord(int var1, int var2, int var3) { + public boolean containsCoord(int plane, int x, int y) { Iterator var4 = this.sections.iterator(); - while (var4.hasNext()) { - WorldMapSection var5 = (WorldMapSection)var4.next(); - if (var5.containsCoord(var1, var2, var3)) { - return true; + WorldMapSection var5; + do { + if (!var4.hasNext()) { + return false; } - } - return false; + var5 = (WorldMapSection)var4.next(); + } while(!var5.containsCoord(plane, x, y)); + + return true; } @ObfuscatedName("w") @@ -175,21 +177,23 @@ public class WorldMapArea { garbageValue = "-693447297" ) @Export("containsPosition") - public boolean containsPosition(int var1, int var2) { - int var3 = var1 / 64; - int var4 = var2 / 64; + public boolean containsPosition(int x, int y) { + int var3 = x / 64; + int var4 = y / 64; if (var3 >= this.minX0 && var3 <= this.maxX0) { if (var4 >= this.minY0 && var4 <= this.maxY0) { Iterator var5 = this.sections.iterator(); - while (var5.hasNext()) { - WorldMapSection var6 = (WorldMapSection)var5.next(); - if (var6.containsPosition(var1, var2)) { - return true; + WorldMapSection var6; + do { + if (!var5.hasNext()) { + return false; } - } - return false; + var6 = (WorldMapSection)var5.next(); + } while(!var6.containsPosition(x, y)); + + return true; } else { return false; } @@ -204,17 +208,19 @@ public class WorldMapArea { garbageValue = "745399916" ) @Export("position") - public int[] position(int var1, int var2, int var3) { + public int[] position(int plane, int x, int y) { Iterator var4 = this.sections.iterator(); - while (var4.hasNext()) { - WorldMapSection var5 = (WorldMapSection)var4.next(); - if (var5.containsCoord(var1, var2, var3)) { - return var5.position(var1, var2, var3); + WorldMapSection var5; + do { + if (!var4.hasNext()) { + return null; } - } - return null; + var5 = (WorldMapSection)var4.next(); + } while(!var5.containsCoord(plane, x, y)); + + return var5.position(plane, x, y); } @ObfuscatedName("u") @@ -223,17 +229,19 @@ public class WorldMapArea { garbageValue = "1509069978" ) @Export("coord") - public TileLocation coord(int var1, int var2) { + public Coord coord(int x, int y) { Iterator var3 = this.sections.iterator(); - while (var3.hasNext()) { - WorldMapSection var4 = (WorldMapSection)var3.next(); - if (var4.containsPosition(var1, var2)) { - return var4.coord(var1, var2); + WorldMapSection var4; + do { + if (!var3.hasNext()) { + return null; } - } - return null; + var4 = (WorldMapSection)var3.next(); + } while(!var4.containsPosition(x, y)); + + return var4.coord(x, y); } @ObfuscatedName("g") @@ -387,8 +395,8 @@ public class WorldMapArea { garbageValue = "-1411761003" ) @Export("origin") - public TileLocation origin() { - return new TileLocation(this.origin0); + public Coord origin() { + return new Coord(this.origin0); } @ObfuscatedName("m") diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java index 92be204da6..4c259a1f69 100644 --- a/runescape-client/src/main/java/WorldMapAreaData.java +++ b/runescape-client/src/main/java/WorldMapAreaData.java @@ -5,6 +5,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("ae") @Implements("WorldMapAreaData") @@ -68,10 +69,10 @@ public class WorldMapAreaData extends WorldMapArea { for (int var4 = 0; var4 < var3; ++var4) { int var5 = var1.method51(); - TileLocation var6 = new TileLocation(var1.readInt()); + Coord var6 = new Coord(var1.readInt()); boolean var7 = var1.readUnsignedByte() == 1; if (var2 || !var7) { - this.field1018.add(new WorldMapIcon1((TileLocation)null, var6, var5, (WorldMapLabel)null)); + this.field1018.add(new WorldMapIcon1((Coord)null, var6, var5, (WorldMapLabel)null)); } } @@ -88,13 +89,13 @@ public class WorldMapAreaData extends WorldMapArea { if (var1 != null) { return var1; } else { - byte[] var2 = SequenceDefinition.SequenceDefinition_indexCache.takeRecord(12, var0); + byte[] var2 = SequenceDefinition.SequenceDefinition_archive.takeFile(12, var0); var1 = new SequenceDefinition(); if (var2 != null) { - var1.read(new Buffer(var2)); + var1.decode(new Buffer(var2)); } - var1.init(); + var1.postDecode(); SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); return var1; } @@ -131,11 +132,11 @@ public class WorldMapAreaData extends WorldMapArea { var4 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); var3 = false; } else { - var4 = var2 ? WorldMapIcon1.field1030 : class12.field1111; + var4 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111; } int var5; - if (var0 == 1300) { + if (var0 == ScriptOpcodes.CC_SETOP) { var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] - 1; if (var5 >= 0 && var5 <= 9) { var4.setAction(var5, Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); @@ -146,28 +147,28 @@ public class WorldMapAreaData extends WorldMapArea { } } else { int var6; - if (var0 == 1301) { + if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { RouteStrategy.Interpreter_intStackSize -= 2; var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; var4.parent = class204.getWidgetChild(var5, var6); return 1; - } else if (var0 == 1302) { + } else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { var4.isScrollBar = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; - } else if (var0 == 1303) { + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { var4.dragZoneSize = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; return 1; - } else if (var0 == 1304) { + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { var4.dragThreshold = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; return 1; - } else if (var0 == 1305) { + } else if (var0 == ScriptOpcodes.CC_SETOPBASE) { var4.dataText = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; return 1; - } else if (var0 == 1306) { + } else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { var4.spellActionName = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; return 1; - } else if (var0 == 1307) { + } else if (var0 == ScriptOpcodes.CC_CLEAROPS) { var4.actions = null; return 1; } else if (var0 == 1308) { @@ -285,7 +286,8 @@ public class WorldMapAreaData extends WorldMapArea { signature = "(ZI)V", garbageValue = "-1746120861" ) - static void method705(boolean var0) { + @Export("setTapToDrop") + static void setTapToDrop(boolean var0) { Client.tapToDrop = var0; } } diff --git a/runescape-client/src/main/java/WorldMapCacheName.java b/runescape-client/src/main/java/WorldMapCacheName.java index 5f0a3c4402..e01228c344 100644 --- a/runescape-client/src/main/java/WorldMapCacheName.java +++ b/runescape-client/src/main/java/WorldMapCacheName.java @@ -70,7 +70,7 @@ public class WorldMapCacheName { } else { ByteArrayPool.field55 = null; WorldMapSection2.field1082 = null; - RouteStrategy.field760 = (byte[][][])null; + RouteStrategy.field760 = ((byte[][][])null); } } @@ -80,7 +80,8 @@ public class WorldMapCacheName { signature = "(Ljava/lang/String;ZZI)V", garbageValue = "1532180466" ) - public static void method635(String var0, boolean var1, boolean var2) { + @Export("openURL") + public static void openURL(String var0, boolean var1, boolean var2) { if (var1) { if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { try { @@ -144,24 +145,24 @@ public class WorldMapCacheName { garbageValue = "519207109" ) @Export("addPlayerToScene") - static void addPlayerToScene(Player var0, boolean var1) { - if (var0 != null && var0.isVisible() && !var0.isHidden) { - var0.isUnanimated = false; - if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.movementSequence == var0.idleSequence) { - var0.isUnanimated = true; + static void addPlayerToScene(Player player, boolean var1) { + if (player != null && player.isVisible() && !player.isHidden) { + player.isUnanimated = false; + if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && player.movementSequence == player.readySequence) { + player.isUnanimated = true; } - int var2 = var0.x >> 7; - int var3 = var0.y >> 7; + int var2 = player.x >> 7; + int var3 = player.y >> 7; if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { - long var4 = FontName.calculateTag(0, 0, 0, false, var0.index); - if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { - var0.isUnanimated = false; - var0.tileHeight = class32.getTileHeight(var0.x, var0.y, SoundSystem.plane); - var0.playerCycle = Client.cycle; - class65.scene.method286(SoundSystem.plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.field9, var4, var0.field721, var0.field722, var0.field723, var0.field724); + long var4 = FontName.calculateTag(0, 0, 0, false, player.index); + if (player.model0 != null && Client.cycle >= player.animationCycleStart && Client.cycle < player.animationCycleEnd) { + player.isUnanimated = false; + player.tileHeight = class32.getTileHeight(player.x, player.y, SoundSystem.plane); + player.playerCycle = Client.cycle; + class65.scene.method286(SoundSystem.plane, player.x, player.y, player.tileHeight, 60, player, player.field9, var4, player.field721, player.field722, player.field723, player.field724); } else { - if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { + if ((player.x & 127) == 64 && (player.y & 127) == 64) { if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { return; } @@ -169,9 +170,9 @@ public class WorldMapCacheName { Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; } - var0.tileHeight = class32.getTileHeight(var0.x, var0.y, SoundSystem.plane); - var0.playerCycle = Client.cycle; - class65.scene.method285(SoundSystem.plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.field9, var4, var0.field10); + player.tileHeight = class32.getTileHeight(player.x, player.y, SoundSystem.plane); + player.playerCycle = Client.cycle; + class65.scene.method285(SoundSystem.plane, player.x, player.y, player.tileHeight, 60, player, player.field9, var4, player.field10); } } } diff --git a/runescape-client/src/main/java/WorldMapDecoration.java b/runescape-client/src/main/java/WorldMapDecoration.java index fd15e8530c..ba3cfb9896 100644 --- a/runescape-client/src/main/java/WorldMapDecoration.java +++ b/runescape-client/src/main/java/WorldMapDecoration.java @@ -6,14 +6,13 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("v") @Implements("WorldMapDecoration") -public class WorldMapDecoration -{ +public class WorldMapDecoration { @ObfuscatedName("dd") @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache4") - static IndexCache indexCache4; + @Export("archive4") + static Archive archive4; @ObfuscatedName("kw") @ObfuscatedGetter( intValue = -12041645 @@ -97,7 +96,7 @@ public class WorldMapDecoration ScriptEvent var5 = new ScriptEvent(); var5.widget = var4; var5.args0 = var4.onTargetEnter; - AbstractIndexCache.runScript(var5); + AbstractArchive.runScript(var5); } Client.field157 = var3; diff --git a/runescape-client/src/main/java/WorldMapDecorationType.java b/runescape-client/src/main/java/WorldMapDecorationType.java index fd5ef00171..fbe474bd51 100644 --- a/runescape-client/src/main/java/WorldMapDecorationType.java +++ b/runescape-client/src/main/java/WorldMapDecorationType.java @@ -161,17 +161,17 @@ public enum WorldMapDecorationType implements Enumerated { garbageValue = "1" ) public static InvDefinition method4523(int var0) { - InvDefinition var1 = (InvDefinition)InvDefinition.field427.get((long)var0); + InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); if (var1 != null) { return var1; } else { - byte[] var2 = class4.field1158.takeRecord(5, var0); + byte[] var2 = class4.field1158.takeFile(5, var0); var1 = new InvDefinition(); if (var2 != null) { - var1.read(new Buffer(var2)); + var1.decode(new Buffer(var2)); } - InvDefinition.field427.put(var1, (long)var0); + InvDefinition.InvDefinition_cached.put(var1, (long)var0); return var1; } } @@ -192,8 +192,8 @@ public enum WorldMapDecorationType implements Enumerated { garbageValue = "1521012895" ) static final void method4517(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (GroundItemPile.loadWidgetGroup(var0)) { - class238.updateWidgetGroup(Widget.widgets[var0], -1, var1, var2, var3, var4, var5, var6); + if (GroundItemPile.loadInterface(var0)) { + class238.updateInterface(Widget.interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); } } diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java index 62870b4599..fa307bd627 100644 --- a/runescape-client/src/main/java/WorldMapElement.java +++ b/runescape-client/src/main/java/WorldMapElement.java @@ -11,7 +11,8 @@ public class WorldMapElement extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field1019; + @Export("WorldMapElement_archive") + public static AbstractArchive WorldMapElement_archive; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Ler;" @@ -123,15 +124,15 @@ public class WorldMapElement extends DualNode { signature = "(Lgr;B)V", garbageValue = "81" ) - @Export("read") - public void read(Buffer var1) { + @Export("decode") + public void decode(Buffer buffer) { while (true) { - int var2 = var1.readUnsignedByte(); + int var2 = buffer.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(buffer, var2); } } @@ -140,83 +141,83 @@ public class WorldMapElement extends DualNode { signature = "(Lgr;II)V", garbageValue = "-1197630144" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { - if (var2 == 1) { - this.sprite1 = var1.method51(); - } else if (var2 == 2) { - this.sprite2 = var1.method51(); - } else if (var2 == 3) { - this.field1021 = var1.readStringCp1252NullTerminated(); - } else if (var2 == 4) { - this.field1022 = var1.readMedium(); - } else if (var2 == 5) { - var1.readMedium(); - } else if (var2 == 6) { - this.textSize = var1.readUnsignedByte(); + @Export("decodeNext") + void decodeNext(Buffer buffer, int opcode) { + if (opcode == 1) { + this.sprite1 = buffer.method51(); + } else if (opcode == 2) { + this.sprite2 = buffer.method51(); + } else if (opcode == 3) { + this.field1021 = buffer.readStringCp1252NullTerminated(); + } else if (opcode == 4) { + this.field1022 = buffer.readMedium(); + } else if (opcode == 5) { + buffer.readMedium(); + } else if (opcode == 6) { + this.textSize = buffer.readUnsignedByte(); } else { int var3; - if (var2 == 7) { - var3 = var1.readUnsignedByte(); + if (opcode == 7) { + var3 = buffer.readUnsignedByte(); if ((var3 & 1) == 0) { } if ((var3 & 2) == 2) { } - } else if (var2 == 8) { - var1.readUnsignedByte(); - } else if (var2 >= 10 && var2 <= 14) { - this.strings[var2 - 10] = var1.readStringCp1252NullTerminated(); - } else if (var2 == 15) { - var3 = var1.readUnsignedByte(); + } else if (opcode == 8) { + buffer.readUnsignedByte(); + } else if (opcode >= 10 && opcode <= 14) { + this.strings[opcode - 10] = buffer.readStringCp1252NullTerminated(); + } else if (opcode == 15) { + var3 = buffer.readUnsignedByte(); this.field1023 = new int[var3 * 2]; int var4; for (var4 = 0; var4 < var3 * 2; ++var4) { - this.field1023[var4] = var1.method44(); + this.field1023[var4] = buffer.method44(); } - var1.readInt(); - var4 = var1.readUnsignedByte(); + buffer.readInt(); + var4 = buffer.readUnsignedByte(); this.field1028 = new int[var4]; int var5; for (var5 = 0; var5 < this.field1028.length; ++var5) { - this.field1028[var5] = var1.readInt(); + this.field1028[var5] = buffer.readInt(); } this.field1029 = new byte[var3]; for (var5 = 0; var5 < var3; ++var5) { - this.field1029[var5] = var1.readByte(); + this.field1029[var5] = buffer.readByte(); } - } else if (var2 != 16) { - if (var2 == 17) { - this.string1 = var1.readStringCp1252NullTerminated(); - } else if (var2 == 18) { - var1.method51(); - } else if (var2 == 19) { - this.category = var1.readUnsignedShort(); - } else if (var2 == 21) { - var1.readInt(); - } else if (var2 == 22) { - var1.readInt(); - } else if (var2 == 23) { - var1.readUnsignedByte(); - var1.readUnsignedByte(); - var1.readUnsignedByte(); - } else if (var2 == 24) { - var1.method44(); - var1.method44(); - } else if (var2 == 25) { - var1.method51(); - } else if (var2 == 28) { - var1.readUnsignedByte(); - } else if (var2 == 29) { + } else if (opcode != 16) { + if (opcode == 17) { + this.string1 = buffer.readStringCp1252NullTerminated(); + } else if (opcode == 18) { + buffer.method51(); + } else if (opcode == 19) { + this.category = buffer.readUnsignedShort(); + } else if (opcode == 21) { + buffer.readInt(); + } else if (opcode == 22) { + buffer.readInt(); + } else if (opcode == 23) { + buffer.readUnsignedByte(); + buffer.readUnsignedByte(); + buffer.readUnsignedByte(); + } else if (opcode == 24) { + buffer.method44(); + buffer.method44(); + } else if (opcode == 25) { + buffer.method51(); + } else if (opcode == 28) { + buffer.readUnsignedByte(); + } else if (opcode == 29) { class266[] var6 = new class266[]{class266.field3527, class266.field3526, class266.field3529}; - this.field3287 = (class266)ScriptFrame.findEnumerated(var6, var1.readUnsignedByte()); - } else if (var2 == 30) { - this.field3301 = (class249)ScriptFrame.findEnumerated(UnderlayDefinition.method4839(), var1.readUnsignedByte()); + this.field3287 = (class266)ScriptFrame.findEnumerated(var6, buffer.readUnsignedByte()); + } else if (opcode == 30) { + this.field3301 = (class249)ScriptFrame.findEnumerated(FloorUnderlayDefinition.method4839(), buffer.readUnsignedByte()); } } } @@ -272,7 +273,7 @@ public class WorldMapElement extends DualNode { if (var2 != null) { return var2; } else { - var2 = class322.readSprite(field1019, var1, 0); + var2 = class322.readSprite(WorldMapElement_archive, var1, 0); if (var2 != null) { WorldMapElement_cachedSprites.put(var2, (long)var1); } diff --git a/runescape-client/src/main/java/WorldMapEvent.java b/runescape-client/src/main/java/WorldMapEvent.java index a3188d88f5..77adb62209 100644 --- a/runescape-client/src/main/java/WorldMapEvent.java +++ b/runescape-client/src/main/java/WorldMapEvent.java @@ -24,18 +24,18 @@ public class WorldMapEvent { signature = "Lhu;" ) @Export("coord1") - public TileLocation coord1; + public Coord coord1; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lhu;" ) @Export("coord2") - public TileLocation coord2; + public Coord coord2; @ObfuscatedSignature( signature = "(ILhu;Lhu;)V" ) - public WorldMapEvent(int var1, TileLocation var2, TileLocation var3) { + public WorldMapEvent(int var1, Coord var2, Coord var3) { this.mapElement = var1; this.coord1 = var2; this.coord2 = var3; @@ -47,7 +47,7 @@ public class WorldMapEvent { garbageValue = "-782761258" ) public static int method780(int var0) { - return UnitPriceComparator.method134(ViewportMouse.ViewportMouse_entityTags[var0]); + return GrandExchangeOfferUnitPriceComparator.method134(ViewportMouse.ViewportMouse_entityTags[var0]); } @ObfuscatedName("iy") @@ -69,27 +69,27 @@ public class WorldMapEvent { int var9 = ViewportMouse.ViewportMouse_entityCount; if (var8 >= var9) { if (-1L != var4) { - var8 = UnitPriceComparator.method134(var4); + var8 = GrandExchangeOfferUnitPriceComparator.method134(var4); int var29 = (int)(var4 >>> 7 & 127L); Player var11 = Client.players[Client.combatTargetPlayerIndex]; - TotalQuantityComparator.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var29); + GrandExchangeOfferTotalQuantityComparator.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var29); } return; } - long tag = ViewportMouse.ViewportMouse_entityTags[var8]; - if (var6 != tag) { + long var10 = ViewportMouse.ViewportMouse_entityTags[var8]; + if (var6 != var10) { label276: { - var6 = tag; - int x = method780(var8); + var6 = var10; + int var12 = method780(var8); long var13 = ViewportMouse.ViewportMouse_entityTags[var8]; - int y = (int)(var13 >>> 7 & 127L); - y = y; + int var15 = (int)(var13 >>> 7 & 127L); + var15 = var15; int var16 = GrandExchangeEvent.method80(var8); - int identifier = ClientPreferences.method1808(var8); - if (var16 == 2 && class65.scene.getObjectFlags(SoundSystem.plane, x, y, tag) >= 0) { - ObjectDefinition var18 = class50.getObjectDefinition(identifier); + int var17 = ClientPreferences.method1808(var8); + if (var16 == 2 && class65.scene.getObjectFlags(SoundSystem.plane, var12, var15, var10) >= 0) { + ObjectDefinition var18 = class50.getObjectDefinition(var17); if (var18.transforms != null) { var18 = var18.transform(); } @@ -99,10 +99,10 @@ public class WorldMapEvent { } if (Client.isItemSelected == 1) { - Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(65535) + var18.name, 1, identifier, x, y); + Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(65535) + var18.name, 1, var17, var12, var15); } else if (Client.isSpellSelected) { if ((FloorDecoration.selectedSpellFlags & 4) == 4) { - Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(65535) + var18.name, 2, identifier, x, y); + Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(65535) + var18.name, 2, var17, var12, var15); } } else { String[] var19 = var18.actions; @@ -130,90 +130,90 @@ public class WorldMapEvent { var21 = 1001; } - Tiles.insertMenuItemNoShift(var19[var20], BufferedFile.colorStartTag(65535) + var18.name, var21, identifier, x, y); + Tiles.insertMenuItemNoShift(var19[var20], BufferedFile.colorStartTag(65535) + var18.name, var21, var17, var12, var15); } } } - Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(65535) + var18.name, 1002, var18.id, x, y); + Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(65535) + var18.name, 1002, var18.id, var12, var15); } } - int var22; + int[] var22; int var30; - NPC var31; - Player var32; - int[] var34; + int var31; + NPC var32; + Player var34; if (var16 == 1) { - NPC var23 = Client.npcs[identifier]; + NPC var23 = Client.npcs[var17]; if (var23 == null) { break label276; } if (var23.definition.size == 1 && (var23.x & 127) == 64 && (var23.y & 127) == 64) { - for (var30 = 0; var30 < Client.npcCount; ++var30) { - var31 = Client.npcs[Client.npcIndices[var30]]; - if (var31 != null && var23 != var31 && var31.definition.size == 1 && var31.x == var23.x && var31.y == var23.y) { - Tile.addNpcToMenu(var31.definition, Client.npcIndices[var30], x, y); + for (var31 = 0; var31 < Client.npcCount; ++var31) { + var32 = Client.npcs[Client.npcIndices[var31]]; + if (var32 != null && var23 != var32 && var32.definition.size == 1 && var32.x == var23.x && var32.y == var23.y) { + Tile.addNpcToMenu(var32.definition, Client.npcIndices[var31], var12, var15); } } - var30 = Players.Players_count; - var34 = Players.Players_indices; + var31 = Players.Players_count; + var22 = Players.Players_indices; - for (var22 = 0; var22 < var30; ++var22) { - var32 = Client.players[var34[var22]]; - if (var32 != null && var32.x == var23.x && var32.y == var23.y) { - TotalQuantityComparator.addPlayerToMenu(var32, var34[var22], x, y); + for (var30 = 0; var30 < var31; ++var30) { + var34 = Client.players[var22[var30]]; + if (var34 != null && var34.x == var23.x && var34.y == var23.y) { + GrandExchangeOfferTotalQuantityComparator.addPlayerToMenu(var34, var22[var30], var12, var15); } } } - Tile.addNpcToMenu(var23.definition, identifier, x, y); + Tile.addNpcToMenu(var23.definition, var17, var12, var15); } if (var16 == 0) { - Player var33 = Client.players[identifier]; + Player var33 = Client.players[var17]; if (var33 == null) { break label276; } if ((var33.x & 127) == 64 && (var33.y & 127) == 64) { - for (var30 = 0; var30 < Client.npcCount; ++var30) { - var31 = Client.npcs[Client.npcIndices[var30]]; - if (var31 != null && var31.definition.size == 1 && var33.x == var31.x && var33.y == var31.y) { - Tile.addNpcToMenu(var31.definition, Client.npcIndices[var30], x, y); + for (var31 = 0; var31 < Client.npcCount; ++var31) { + var32 = Client.npcs[Client.npcIndices[var31]]; + if (var32 != null && var32.definition.size == 1 && var33.x == var32.x && var33.y == var32.y) { + Tile.addNpcToMenu(var32.definition, Client.npcIndices[var31], var12, var15); } } - var30 = Players.Players_count; - var34 = Players.Players_indices; + var31 = Players.Players_count; + var22 = Players.Players_indices; - for (var22 = 0; var22 < var30; ++var22) { - var32 = Client.players[var34[var22]]; - if (var32 != null && var32 != var33 && var32.x == var33.x && var32.y == var33.y) { - TotalQuantityComparator.addPlayerToMenu(var32, var34[var22], x, y); + for (var30 = 0; var30 < var31; ++var30) { + var34 = Client.players[var22[var30]]; + if (var34 != null && var34 != var33 && var34.x == var33.x && var34.y == var33.y) { + GrandExchangeOfferTotalQuantityComparator.addPlayerToMenu(var34, var22[var30], var12, var15); } } } - if (identifier != Client.combatTargetPlayerIndex) { - TotalQuantityComparator.addPlayerToMenu(var33, identifier, x, y); + if (var17 != Client.combatTargetPlayerIndex) { + GrandExchangeOfferTotalQuantityComparator.addPlayerToMenu(var33, var17, var12, var15); } else { - var4 = tag; + var4 = var10; } } if (var16 == 3) { - NodeDeque var35 = Client.groundItems[SoundSystem.plane][x][y]; + NodeDeque var35 = Client.groundItems[SoundSystem.plane][var12][var15]; if (var35 != null) { for (GroundItem var24 = (GroundItem)var35.first(); var24 != null; var24 = (GroundItem)var35.next()) { ItemDefinition var25 = Skills.getItemDefinition(var24.id); if (Client.isItemSelected == 1) { - Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(16748608) + var25.name, 16, var24.id, x, y); + Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(16748608) + var25.name, 16, var24.id, var12, var15); } else if (Client.isSpellSelected) { if ((FloorDecoration.selectedSpellFlags & 1) == 1) { - Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(16748608) + var25.name, 17, var24.id, x, y); + Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(16748608) + var25.name, 17, var24.id, var12, var15); } } else { String[] var26 = var25.groundActions; @@ -241,13 +241,13 @@ public class WorldMapEvent { var28 = 22; } - Tiles.insertMenuItemNoShift(var26[var27], BufferedFile.colorStartTag(16748608) + var25.name, var28, var24.id, x, y); + Tiles.insertMenuItemNoShift(var26[var27], BufferedFile.colorStartTag(16748608) + var25.name, var28, var24.id, var12, var15); } else if (var27 == 2) { - Tiles.insertMenuItemNoShift("Take", BufferedFile.colorStartTag(16748608) + var25.name, 20, var24.id, x, y); + Tiles.insertMenuItemNoShift("Take", BufferedFile.colorStartTag(16748608) + var25.name, 20, var24.id, var12, var15); } } - Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(16748608) + var25.name, 1004, var24.id, x, y); + Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(16748608) + var25.name, 1004, var24.id, var12, var15); } } } diff --git a/runescape-client/src/main/java/WorldMapIcon1.java b/runescape-client/src/main/java/WorldMapIcon1.java index e4b4df12a8..002ffe1a56 100644 --- a/runescape-client/src/main/java/WorldMapIcon1.java +++ b/runescape-client/src/main/java/WorldMapIcon1.java @@ -17,8 +17,8 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache3") - static IndexCache indexCache3; + @Export("archive3") + static Archive archive3; @ObfuscatedName("ec") @Export("secureRandom") static SecureRandom secureRandom; @@ -32,13 +32,14 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { @ObfuscatedGetter( intValue = -1722323621 ) - final int field1031; + @Export("element") + final int element; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Laj;" ) - @Export("label0") - final WorldMapLabel label0; + @Export("label") + final WorldMapLabel label; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 364253793 @@ -53,11 +54,11 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { @ObfuscatedSignature( signature = "(Lhu;Lhu;ILaj;)V" ) - WorldMapIcon1(TileLocation var1, TileLocation var2, int var3, WorldMapLabel var4) { + WorldMapIcon1(Coord var1, Coord var2, int var3, WorldMapLabel var4) { super(var1, var2); - this.field1031 = var3; - this.label0 = var4; - WorldMapElement var5 = ViewportMouse.getWorldMapElement(this.vmethod395()); + this.element = var3; + this.label = var4; + WorldMapElement var5 = ViewportMouse.getWorldMapElement(this.getElement()); Sprite var6 = var5.getSprite(false); if (var6 != null) { this.field1032 = var6.subWidth; @@ -74,8 +75,9 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { signature = "(I)I", garbageValue = "1990181988" ) - public int vmethod395() { - return this.field1031; + @Export("getElement") + public int getElement() { + return this.element; } @ObfuscatedName("f") @@ -83,8 +85,9 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { signature = "(I)Laj;", garbageValue = "1159446036" ) - WorldMapLabel vmethod396() { - return this.label0; + @Export("getLabel") + WorldMapLabel getLabel() { + return this.label; } @ObfuscatedName("q") @@ -110,7 +113,8 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { signature = "(ILjava/lang/String;Ljava/lang/String;I)V", garbageValue = "-460290173" ) - static void method219(int var0, String var1, String var2) { + @Export("addGameMessage") + static void addGameMessage(int var0, String var1, String var2) { GrandExchangeEvents.addChatMessage(var0, var1, var2, (String)null); } @@ -121,57 +125,57 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { ) static final void method212() { for (int var0 = 0; var0 < Client.soundEffectCount; ++var0) { - int var10002 = Client.queuedSoundEffectDelays[var0]--; + int var10003 = Client.queuedSoundEffectDelays[var0]--; if (Client.queuedSoundEffectDelays[var0] >= -10) { - SoundEffect var10 = Client.soundEffects[var0]; - if (var10 == null) { - Object var2 = null; - var10 = SoundEffect.readSoundEffect(WorldMapDecoration.indexCache4, Client.soundEffectIds[var0], 0); - if (var10 == null) { + SoundEffect var11 = Client.soundEffects[var0]; + if (var11 == null) { + Object var3 = null; + var11 = SoundEffect.readSoundEffect(WorldMapDecoration.archive4, Client.soundEffectIds[var0], 0); + if (var11 == null) { continue; } - int[] var10000 = Client.queuedSoundEffectDelays; - var10000[var0] += var10.method303(); - Client.soundEffects[var0] = var10; + int[] var4 = Client.queuedSoundEffectDelays; + var4[var0] += var11.method303(); + Client.soundEffects[var0] = var11; } if (Client.queuedSoundEffectDelays[var0] < 0) { - int var11; + int var12; if (Client.soundLocations[var0] != 0) { - int var3 = (Client.soundLocations[var0] & 255) * 128; - int var4 = Client.soundLocations[var0] >> 16 & 255; - int var5 = var4 * 128 + 64 - Canvas.localPlayer.x; - if (var5 < 0) { - var5 = -var5; + int var13 = (Client.soundLocations[var0] & 255) * 128; + int var5 = Client.soundLocations[var0] >> 16 & 255; + int var6 = var5 * 128 + 64 - Canvas.localPlayer.x; + if (var6 < 0) { + var6 = -var6; } - int var6 = Client.soundLocations[var0] >> 8 & 255; - int var7 = var6 * 128 + 64 - Canvas.localPlayer.y; - if (var7 < 0) { - var7 = -var7; + int var7 = Client.soundLocations[var0] >> 8 & 255; + int var8 = var7 * 128 + 64 - Canvas.localPlayer.y; + if (var8 < 0) { + var8 = -var8; } - int var8 = var5 + var7 - 128; - if (var8 > var3) { + int var9 = var6 + var8 - 128; + if (var9 > var13) { Client.queuedSoundEffectDelays[var0] = -100; continue; } - if (var8 < 0) { - var8 = 0; + if (var9 < 0) { + var9 = 0; } - var11 = (var3 - var8) * Client.field115 / var3; + var12 = (var13 - var9) * Client.field115 / var13; } else { - var11 = Client.soundEffectVolume; + var12 = Client.soundEffectVolume; } - if (var11 > 0) { - RawSound var12 = var10.toRawSound().resample(MilliClock.decimator); - RawPcmStream var13 = RawPcmStream.createRawPcmStream(var12, 100, var11); - var13.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1); - TaskHandler.pcmStreamMixer.addSubStream(var13); + if (var12 > 0) { + RawSound var14 = var11.toRawSound().resample(MilliClock.decimator); + RawPcmStream var15 = RawPcmStream.createRawPcmStream(var14, 100, var12); + var15.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1); + TaskHandler.pcmStreamMixer.addSubStream(var15); } Client.queuedSoundEffectDelays[var0] = -100; @@ -179,12 +183,12 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { } else { --Client.soundEffectCount; - for (int var1 = var0; var1 < Client.soundEffectCount; ++var1) { - Client.soundEffectIds[var1] = Client.soundEffectIds[var1 + 1]; - Client.soundEffects[var1] = Client.soundEffects[var1 + 1]; - Client.queuedSoundEffectLoops[var1] = Client.queuedSoundEffectLoops[var1 + 1]; - Client.queuedSoundEffectDelays[var1] = Client.queuedSoundEffectDelays[var1 + 1]; - Client.soundLocations[var1] = Client.soundLocations[var1 + 1]; + for (int var2 = var0; var2 < Client.soundEffectCount; ++var2) { + Client.soundEffectIds[var2] = Client.soundEffectIds[var2 + 1]; + Client.soundEffects[var2] = Client.soundEffects[var2 + 1]; + Client.queuedSoundEffectLoops[var2] = Client.queuedSoundEffectLoops[var2 + 1]; + Client.queuedSoundEffectDelays[var2] = Client.queuedSoundEffectDelays[var2 + 1]; + Client.soundLocations[var2] = Client.soundLocations[var2 + 1]; } --var0; @@ -192,16 +196,16 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { } if (Client.field107) { - boolean var9; + boolean var10; if (class214.field1129 != 0) { - var9 = true; + var10 = true; } else { - var9 = class214.midiPcmStream.isReady(); + var10 = class214.midiPcmStream.isReady(); } - if (!var9) { + if (!var10) { if (Client.field128 != 0 && Client.field112 != -1) { - Login.method2076(UserComparator3.indexCache6, Client.field112, 0, Client.field128, false); + Login.method2076(UserComparator3.archive6, Client.field112, 0, Client.field128, false); } Client.field107 = false; diff --git a/runescape-client/src/main/java/WorldMapIcon2.java b/runescape-client/src/main/java/WorldMapIcon2.java index baf78223a7..7138ead64f 100644 --- a/runescape-client/src/main/java/WorldMapIcon2.java +++ b/runescape-client/src/main/java/WorldMapIcon2.java @@ -23,13 +23,14 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon { @ObfuscatedGetter( intValue = -25914375 ) - int field1036; + @Export("element") + int element; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Laj;" ) - @Export("label0") - WorldMapLabel label0; + @Export("label") + WorldMapLabel label; @ObfuscatedName("o") @ObfuscatedGetter( intValue = 927871683 @@ -44,7 +45,7 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon { @ObfuscatedSignature( signature = "(Lhu;Lhu;ILav;)V" ) - WorldMapIcon2(TileLocation var1, TileLocation var2, int var3, WorldMapRegion var4) { + WorldMapIcon2(Coord var1, Coord var2, int var3, WorldMapRegion var4) { super(var1, var2); this.field1034 = var3; this.field1035 = var4; @@ -56,8 +57,9 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon { signature = "(I)I", garbageValue = "1990181988" ) - public int vmethod395() { - return this.field1036; + @Export("getElement") + public int getElement() { + return this.element; } @ObfuscatedName("f") @@ -65,8 +67,9 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon { signature = "(I)Laj;", garbageValue = "1159446036" ) - WorldMapLabel vmethod396() { - return this.label0; + @Export("getLabel") + WorldMapLabel getLabel() { + return this.label; } @ObfuscatedName("q") @@ -93,9 +96,9 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon { garbageValue = "-806344204" ) void method399() { - this.field1036 = class50.getObjectDefinition(this.field1034).transform().mapIconId; - this.label0 = this.field1035.method420(ViewportMouse.getWorldMapElement(this.field1036)); - WorldMapElement var1 = ViewportMouse.getWorldMapElement(this.vmethod395()); + this.element = class50.getObjectDefinition(this.field1034).transform().mapIconId; + this.label = this.field1035.method420(ViewportMouse.getWorldMapElement(this.element)); + WorldMapElement var1 = ViewportMouse.getWorldMapElement(this.getElement()); Sprite var2 = var1.getSprite(false); if (var2 != null) { this.field1037 = var2.subWidth; diff --git a/runescape-client/src/main/java/WorldMapIndexCacheLoader.java b/runescape-client/src/main/java/WorldMapIndexCacheLoader.java deleted file mode 100644 index 7dadbb8aac..0000000000 --- a/runescape-client/src/main/java/WorldMapIndexCacheLoader.java +++ /dev/null @@ -1,108 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ls") -@Implements("WorldMapIndexCacheLoader") -public class WorldMapIndexCacheLoader { - @ObfuscatedName("o") - @Export("cacheName") - String cacheName; - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lir;" - ) - @Export("indexCache") - AbstractIndexCache indexCache; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 624113115 - ) - @Export("percentLoaded0") - int percentLoaded0; - @ObfuscatedName("l") - @Export("isLoaded0") - boolean isLoaded0; - - @ObfuscatedSignature( - signature = "(Lir;)V" - ) - WorldMapIndexCacheLoader(AbstractIndexCache var1) { - this.percentLoaded0 = 0; - this.isLoaded0 = false; - this.indexCache = var1; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "-1867776989" - ) - @Export("reset") - void reset(String var1) { - if (var1 != null && !var1.isEmpty() && var1 != this.cacheName) { - this.cacheName = var1; - this.percentLoaded0 = 0; - this.isLoaded0 = false; - this.load(); - } - - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "2019633217" - ) - @Export("load") - int load() { - if (this.percentLoaded0 < 33) { - if (!this.indexCache.tryLoadRecordByNames(WorldMapCacheName.WorldMapCacheName_compositeMap.name, this.cacheName)) { - return this.percentLoaded0; - } - - this.percentLoaded0 = 33; - } - - if (this.percentLoaded0 == 33) { - if (this.indexCache.method9(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, this.cacheName) && !this.indexCache.tryLoadRecordByNames(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, this.cacheName)) { - return this.percentLoaded0; - } - - this.percentLoaded0 = 66; - } - - if (this.percentLoaded0 == 66) { - if (!this.indexCache.tryLoadRecordByNames(this.cacheName, WorldMapCacheName.WorldMapCacheName_labels.name)) { - return this.percentLoaded0; - } - - this.percentLoaded0 = 100; - this.isLoaded0 = true; - } - - return this.percentLoaded0; - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "(S)Z", - garbageValue = "-16324" - ) - @Export("isLoaded") - boolean isLoaded() { - return this.isLoaded0; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1342963007" - ) - @Export("percentLoaded") - int percentLoaded() { - return this.percentLoaded0; - } -} diff --git a/runescape-client/src/main/java/WorldMapLabel.java b/runescape-client/src/main/java/WorldMapLabel.java index 0917600d1d..1d30cddb90 100644 --- a/runescape-client/src/main/java/WorldMapLabel.java +++ b/runescape-client/src/main/java/WorldMapLabel.java @@ -190,7 +190,7 @@ public class WorldMapLabel { VarbitDefinition.indexedSpriteWidths = null; SecureRandomCallable.indexedSpriteHeights = null; class328.indexedSpritePalette = null; - class328.spritePixels = (byte[][])null; + class328.spritePixels = ((byte[][])null); return var0; } @@ -200,11 +200,11 @@ public class WorldMapLabel { garbageValue = "1459100828" ) @Export("compareWorlds") - static int compareWorlds(World var0, World var1, int var2, boolean var3) { - if (var2 == 1) { + static int compareWorlds(World var0, World var1, int mode, boolean reversed) { + if (mode == 1) { int var4 = var0.population; int var5 = var1.population; - if (!var3) { + if (!reversed) { if (var4 == -1) { var4 = 2001; } @@ -216,7 +216,7 @@ public class WorldMapLabel { return var4 - var5; } else { - return var2 == 2 ? var0.location - var1.location : (var2 == 3 ? (var0.activity.equals("-") ? (var1.activity.equals("-") ? 0 : (var3 ? -1 : 1)) : (var1.activity.equals("-") ? (var3 ? 1 : -1) : var0.activity.compareTo(var1.activity))) : (var2 == 4 ? (var0.method357() ? (var1.method357() ? 0 : 1) : (var1.method357() ? -1 : 0)) : (var2 == 5 ? (var0.method356() ? (var1.method356() ? 0 : 1) : (var1.method356() ? -1 : 0)) : (var2 == 6 ? (var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0)) : (var2 == 7 ? (var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0)) : var0.id - var1.id))))); + return mode == 2 ? var0.location - var1.location : (mode == 3 ? (var0.activity.equals("-") ? (var1.activity.equals("-") ? 0 : (reversed ? -1 : 1)) : (var1.activity.equals("-") ? (reversed ? 1 : -1) : var0.activity.compareTo(var1.activity))) : (mode == 4 ? (var0.method357() ? (var1.method357() ? 0 : 1) : (var1.method357() ? -1 : 0)) : (mode == 5 ? (var0.method356() ? (var1.method356() ? 0 : 1) : (var1.method356() ? -1 : 0)) : (mode == 6 ? (var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0)) : (mode == 7 ? (var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0)) : var0.id - var1.id))))); } } @@ -241,7 +241,7 @@ public class WorldMapLabel { int var3 = class32.getTileHeight(var0, var1, SoundSystem.plane) - var2; var0 -= WorldMapSection1.cameraX; var3 -= GrandExchangeEvents.cameraY; - var1 -= class11.cameraZ; + var1 -= GrandExchangeOfferNameComparator.cameraZ; int var4 = Rasterizer3D.Rasterizer3D_sine[WorldMapIcon1.cameraPitch]; int var5 = Rasterizer3D.Rasterizer3D_cosine[WorldMapIcon1.cameraPitch]; int var6 = Rasterizer3D.Rasterizer3D_sine[MusicPatchNode.cameraYaw]; diff --git a/runescape-client/src/main/java/WorldMapLabelSize.java b/runescape-client/src/main/java/WorldMapLabelSize.java index 18cb501ec4..05ebdd1621 100644 --- a/runescape-client/src/main/java/WorldMapLabelSize.java +++ b/runescape-client/src/main/java/WorldMapLabelSize.java @@ -35,7 +35,7 @@ public class WorldMapLabelSize { @ObfuscatedSignature( signature = "Lit;" ) - static IndexCache field1040; + static Archive field1040; @ObfuscatedName("fi") @ObfuscatedGetter( intValue = 1577759565 @@ -108,9 +108,9 @@ public class WorldMapLabelSize { PacketBufferNode var0 = Interpreter.method1915(ClientPacket.field242, Client.packetWriter.isaacCipher); Client.packetWriter.method241(var0); - for (WidgetGroupParent var1 = (WidgetGroupParent)Client.widgetGroupParents.first(); var1 != null; var1 = (WidgetGroupParent)Client.widgetGroupParents.next()) { + for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { if (var1.type == 0 || var1.type == 3) { - MenuAction.closeWidgetGroup(var1, true); + MenuAction.closeInterface(var1, true); } } diff --git a/runescape-client/src/main/java/WorldMapManager.java b/runescape-client/src/main/java/WorldMapManager.java index e15da8096e..3c3c0f055c 100644 --- a/runescape-client/src/main/java/WorldMapManager.java +++ b/runescape-client/src/main/java/WorldMapManager.java @@ -51,12 +51,12 @@ public final class WorldMapManager { @ObfuscatedSignature( signature = "Lir;" ) - final AbstractIndexCache field1046; + final AbstractArchive field1046; @ObfuscatedName("x") @ObfuscatedSignature( signature = "Lir;" ) - final AbstractIndexCache field1047; + final AbstractArchive field1047; @ObfuscatedName("d") @Export("fonts") final HashMap fonts; @@ -91,7 +91,7 @@ public final class WorldMapManager { @ObfuscatedSignature( signature = "([Llq;Ljava/util/HashMap;Lir;Lir;)V" ) - public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractIndexCache var3, AbstractIndexCache var4) { + public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractArchive var3, AbstractArchive var4) { this.isLoaded0 = false; this.loadStarted = false; this.field1045 = new HashMap(); @@ -108,21 +108,21 @@ public final class WorldMapManager { garbageValue = "32" ) @Export("load") - public void load(AbstractIndexCache var1, String var2, boolean var3) { + public void load(AbstractArchive indexCache, String cacheName, boolean isMembersWorld) { if (!this.loadStarted) { this.isLoaded0 = false; this.loadStarted = true; System.nanoTime(); - int var4 = var1.getArchiveId(WorldMapCacheName.WorldMapCacheName_details.name); - int var5 = var1.getRecordId(var4, var2); - Buffer var6 = new Buffer(var1.takeRecordByNames(WorldMapCacheName.WorldMapCacheName_details.name, var2)); - Buffer var7 = new Buffer(var1.takeRecordByNames(WorldMapCacheName.WorldMapCacheName_compositeMap.name, var2)); + int var4 = indexCache.getGroupId(WorldMapCacheName.WorldMapCacheName_details.name); + int var5 = indexCache.getFileId(var4, cacheName); + Buffer var6 = new Buffer(indexCache.takeFileByNames(WorldMapCacheName.WorldMapCacheName_details.name, cacheName)); + Buffer var7 = new Buffer(indexCache.takeFileByNames(WorldMapCacheName.WorldMapCacheName_compositeMap.name, cacheName)); System.nanoTime(); System.nanoTime(); this.mapAreaData = new WorldMapAreaData(); try { - this.mapAreaData.method387(var6, var7, var5, var3); + this.mapAreaData.method387(var6, var7, var5, isMembersWorld); } catch (IllegalStateException var16) { return; } @@ -142,36 +142,36 @@ public final class WorldMapManager { this.regions = new WorldMapRegion[var8][var9]; Iterator var10 = this.mapAreaData.field1016.iterator(); - int var12; + int var11; while (var10.hasNext()) { - class15 var11 = (class15)var10.next(); - var12 = var11.field149; - int var13 = var11.field146; - int var14 = var12 - this.mapAreaData.minX(); + class15 var12 = (class15)var10.next(); + var11 = var12.field149; + int var13 = var12.field146; + int var14 = var11 - this.mapAreaData.minX(); int var15 = var13 - this.mapAreaData.minY(); - this.regions[var14][var15] = new WorldMapRegion(var12, var13, this.mapAreaData.method386(), this.fonts); - this.regions[var14][var15].method447(var11, this.mapAreaData.field1018); + this.regions[var14][var15] = new WorldMapRegion(var11, var13, this.mapAreaData.method386(), this.fonts); + this.regions[var14][var15].method447(var12, this.mapAreaData.field1018); } for (int var17 = 0; var17 < var8; ++var17) { - for (var12 = 0; var12 < var9; ++var12) { - if (this.regions[var17][var12] == null) { - this.regions[var17][var12] = new WorldMapRegion(this.mapAreaData.minX() + var17, this.mapAreaData.minY() + var12, this.mapAreaData.method386(), this.fonts); - this.regions[var17][var12].method405(this.mapAreaData.field1017, this.mapAreaData.field1018); + for (var11 = 0; var11 < var9; ++var11) { + if (this.regions[var17][var11] == null) { + this.regions[var17][var11] = new WorldMapRegion(this.mapAreaData.minX() + var17, this.mapAreaData.minY() + var11, this.mapAreaData.method386(), this.fonts); + this.regions[var17][var11].method405(this.mapAreaData.field1017, this.mapAreaData.field1018); } } } System.nanoTime(); System.nanoTime(); - if (var1.method9(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, var2)) { - byte[] var18 = var1.takeRecordByNames(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, var2); + if (indexCache.method9(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, cacheName)) { + byte[] var18 = indexCache.takeFileByNames(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, cacheName); this.overviewSprite = class27.convertJpgToSprite(var18); } System.nanoTime(); - var1.method6(); - var1.method8(); + indexCache.method6(); + indexCache.method8(); this.isLoaded0 = true; } @@ -421,7 +421,7 @@ public final class WorldMapManager { while (var4.hasNext()) { AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); if (var5.method19()) { - int var6 = var5.vmethod395(); + int var6 = var5.getElement(); if (!this.icons.containsKey(var6)) { LinkedList var7 = new LinkedList(); var7.add(var5); @@ -461,16 +461,16 @@ public final class WorldMapManager { garbageValue = "514181856" ) @Export("itemContainerSetItem") - static void itemContainerSetItem(int var0, int var1, int var2, int var3) { - ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + static void itemContainerSetItem(int itemContainerId, int index, int itemId, int itemQuantity) { + ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)itemContainerId); if (var4 == null) { var4 = new ItemContainer(); - ItemContainer.itemContainers.put(var4, (long)var0); + ItemContainer.itemContainers.put(var4, (long)itemContainerId); } - if (var4.ids.length <= var1) { - int[] var5 = new int[var1 + 1]; - int[] var6 = new int[var1 + 1]; + if (var4.ids.length <= index) { + int[] var5 = new int[index + 1]; + int[] var6 = new int[index + 1]; int var7; for (var7 = 0; var7 < var4.ids.length; ++var7) { @@ -478,7 +478,7 @@ public final class WorldMapManager { var6[var7] = var4.quantities[var7]; } - for (var7 = var4.ids.length; var7 < var1; ++var7) { + for (var7 = var4.ids.length; var7 < index; ++var7) { var5[var7] = -1; var6[var7] = 0; } @@ -487,8 +487,8 @@ public final class WorldMapManager { var4.quantities = var6; } - var4.ids[var1] = var2; - var4.quantities[var1] = var3; + var4.ids[index] = itemId; + var4.quantities[index] = itemQuantity; } @ObfuscatedName("s") diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index 4d8247b51b..dbc5e24dfa 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -173,13 +173,13 @@ public class WorldMapRegion { garbageValue = "-896662600" ) void method479(ObjectDefinition var1, int var2, int var3, int var4, class21 var5) { - TileLocation var6 = new TileLocation(var2, var3 + this.x * 64, this.y * 64 + var4); - TileLocation var7 = null; + Coord var6 = new Coord(var2, var3 + this.x * 64, this.y * 64 + var4); + Coord var7 = null; if (this.field239 != null) { - var7 = new TileLocation(this.field239.field148 + var2, var3 + this.field239.field149 * 64, var4 + this.field239.field146 * 64); + var7 = new Coord(this.field239.field148 + var2, var3 + this.field239.field149 * 64, var4 + this.field239.field146 * 64); } else { class39 var8 = (class39)var5; - var7 = new TileLocation(var2 + var8.field148, var3 + var8.field149 * 64 + var8.method717() * 8, var4 + var8.field146 * 64 + var8.method718() * 8); + var7 = new Coord(var2 + var8.field148, var3 + var8.field149 * 64 + var8.method717() * 8, var4 + var8.field146 * 64 + var8.method718() * 8); } Object var10; @@ -190,7 +190,7 @@ public class WorldMapRegion { var10 = new WorldMapIcon1(var7, var6, var9.field1020, this.method420(var9)); } - this.iconsMap.put(new TileLocation(0, var3, var4), var10); + this.iconsMap.put(new Coord(0, var3, var4), var10); } @ObfuscatedName("e") @@ -221,7 +221,7 @@ public class WorldMapRegion { while (var2.hasNext()) { WorldMapIcon1 var3 = (WorldMapIcon1)var2.next(); if (var3.coord2.x >> 6 == this.x && var3.coord2.y >> 6 == this.y) { - WorldMapIcon1 var4 = new WorldMapIcon1(var3.coord2, var3.coord2, var3.field1031, this.method419(var3.field1031)); + WorldMapIcon1 var4 = new WorldMapIcon1(var3.coord2, var3.coord2, var3.element, this.method419(var3.element)); this.iconsList.add(var4); } } @@ -252,7 +252,7 @@ public class WorldMapRegion { signature = "(Lir;B)Z", garbageValue = "2" ) - boolean method409(AbstractIndexCache var1) { + boolean method409(AbstractArchive var1) { if (this.field239 != null) { this.field239.method263(var1); if (this.field239.method271()) { @@ -289,7 +289,7 @@ public class WorldMapRegion { signature = "(ILad;[Llq;Lir;Lir;I)V", garbageValue = "518389076" ) - void method455(int var1, class40 var2, IndexedSprite[] var3, AbstractIndexCache var4, AbstractIndexCache var5) { + void method455(int var1, class40 var2, IndexedSprite[] var3, AbstractArchive var4, AbstractArchive var5) { this.field1054 = var1; if ((this.field239 != null || !this.field1052.isEmpty()) && class13.method164(this.x, this.y, var1) == null) { boolean var6 = true; @@ -301,9 +301,9 @@ public class WorldMapRegion { var7 = ((class21)this.field1052.getFirst()).field150; } - var6 &= var5.tryLoadArchive(var7); + var6 &= var5.tryLoadGroup(var7); if (var6) { - byte[] var8 = var5.takeRecordFlat(var7); + byte[] var8 = var5.takeFileFlat(var7); class27 var9 = SecureRandomCallable.method1145(var8); Sprite var10 = new Sprite(this.field1054 * 64, this.field1054 * 64); var10.setRaster(); @@ -348,7 +348,7 @@ public class WorldMapRegion { while (var4.hasNext()) { AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); if (var5.method19()) { - int var6 = var5.vmethod395(); + int var6 = var5.getElement(); if (var1.contains(var6)) { WorldMapElement var7 = ViewportMouse.getWorldMapElement(var6); this.method414(var7, var5.field5, var5.field6, var2, var3); @@ -444,19 +444,19 @@ public class WorldMapRegion { int var9; if (var7 != -1) { int var10 = this.field1053; - OverlayDefinition var11 = (OverlayDefinition)OverlayDefinition.field664.get((long)var7); - OverlayDefinition var12; + FloorOverlayDefinition var11 = (FloorOverlayDefinition)FloorOverlayDefinition.field664.get((long)var7); + FloorOverlayDefinition var12; if (var11 != null) { var12 = var11; } else { - byte[] var13 = OverlayDefinition.field663.takeRecord(4, var7); - var11 = new OverlayDefinition(); + byte[] var13 = FloorOverlayDefinition.field663.takeFile(4, var7); + var11 = new FloorOverlayDefinition(); if (var13 != null) { - var11.read(new Buffer(var13), var7); + var11.decode(new Buffer(var13), var7); } - var11.init(); - OverlayDefinition.field664.put(var11, (long)var7); + var11.postDecode(); + FloorOverlayDefinition.field664.put(var11, (long)var7); var12 = var11; } @@ -549,19 +549,19 @@ public class WorldMapRegion { int var6 = var3.field145[var5][var1][var2] - 1; if (var6 > -1) { int var7 = this.field1053; - OverlayDefinition var8 = (OverlayDefinition)OverlayDefinition.field664.get((long)var6); - OverlayDefinition var9; + FloorOverlayDefinition var8 = (FloorOverlayDefinition)FloorOverlayDefinition.field664.get((long)var6); + FloorOverlayDefinition var9; if (var8 != null) { var9 = var8; } else { - byte[] var10 = OverlayDefinition.field663.takeRecord(4, var6); - var8 = new OverlayDefinition(); + byte[] var10 = FloorOverlayDefinition.field663.takeFile(4, var6); + var8 = new FloorOverlayDefinition(); if (var10 != null) { - var8.read(new Buffer(var10), var6); + var8.decode(new Buffer(var10), var6); } - var8.init(); - OverlayDefinition.field664.put(var8, (long)var6); + var8.postDecode(); + FloorOverlayDefinition.field664.put(var8, (long)var6); var9 = var8; } @@ -694,13 +694,13 @@ public class WorldMapRegion { boolean var10 = var9 >= WorldMapDecorationType.field2805.id && var9 <= WorldMapDecorationType.field2804.id || var9 == WorldMapDecorationType.field2806.id; if (var10) { ObjectDefinition var11 = class50.getObjectDefinition(var8.objectDefinitionId); - int var12 = var11.int1 != 0 ? 0xffcc0000 : 0xffcccccc; + int var12 = var11.int1 != 0 ? -3407872 : -3355444; if (var8.decoration == WorldMapDecorationType.field2805.id) { this.method422(var1, var2, var8.rotation, var12); } if (var8.decoration == WorldMapDecorationType.field2813.id) { - this.method422(var1, var2, var8.rotation, 0xffcccccc); + this.method422(var1, var2, var8.rotation, -3355444); this.method422(var1, var2, var8.rotation + 1, var12); } @@ -754,14 +754,14 @@ public class WorldMapRegion { while (var7.hasNext()) { Entry var8 = (Entry)var7.next(); - TileLocation var9 = (TileLocation)var8.getKey(); + Coord var9 = (Coord)var8.getKey(); int var10 = (int)((float)var1 + var5 * (float)var9.x - var6); int var11 = (int)((float)(var2 + var4) - var5 * (float)var9.y - var6); AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); if (var12 != null && var12.method19()) { var12.field5 = var10; var12.field6 = var11; - WorldMapElement var13 = ViewportMouse.getWorldMapElement(var12.vmethod395()); + WorldMapElement var13 = ViewportMouse.getWorldMapElement(var12.getElement()); if (!var3.contains(var13.method390())) { this.method415(var12, var10, var11, var5); } @@ -781,7 +781,7 @@ public class WorldMapRegion { while (var4.hasNext()) { AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); if (var5.method19()) { - WorldMapElement var6 = ViewportMouse.getWorldMapElement(var5.vmethod395()); + WorldMapElement var6 = ViewportMouse.getWorldMapElement(var5.getElement()); if (var6 != null && var1.contains(var6.method390())) { this.method414(var6, var5.field5, var5.field6, var2, var3); } @@ -813,7 +813,7 @@ public class WorldMapRegion { garbageValue = "-1283733783" ) void method415(AbstractWorldMapIcon var1, int var2, int var3, float var4) { - WorldMapElement var5 = ViewportMouse.getWorldMapElement(var1.vmethod395()); + WorldMapElement var5 = ViewportMouse.getWorldMapElement(var1.getElement()); this.method416(var5, var2, var3); this.method417(var1, var5, var2, var3, var4); } @@ -839,7 +839,7 @@ public class WorldMapRegion { garbageValue = "-1237576843" ) void method417(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { - WorldMapLabel var6 = var1.vmethod396(); + WorldMapLabel var6 = var1.getLabel(); if (var6 != null && var6.size.method400(var5)) { Font var7 = (Font)this.fonts.get(var6.size); var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field1022, 0, 1, 0, var7.ascent / 2); @@ -863,7 +863,7 @@ public class WorldMapRegion { int var9 = var7.coord2.y % 64; var7.field5 = (int)((float)var8 * var5 + (float)var1); var7.field6 = (int)(var5 * (float)(63 - var9) + (float)var2); - if (!var3.contains(var7.vmethod395())) { + if (!var3.contains(var7.getElement())) { this.method415(var7, var7.field5, var7.field6, var5); } } @@ -1040,7 +1040,8 @@ public class WorldMapRegion { signature = "(Ljava/lang/String;I)I", garbageValue = "1877870965" ) - public static int method550(String var0) { + @Export("stringCp1252NullTerminatedByteSize") + public static int stringCp1252NullTerminatedByteSize(String var0) { return var0.length() + 1; } @@ -1061,7 +1062,7 @@ public class WorldMapRegion { if (var3.contains(var4, var5)) { var4 -= var3.width / 2; var5 -= var3.height / 2; - int var6 = Client.minimapOrientation & 2047; + int var6 = Client.camAngleY & 2047; int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; int var9 = var4 * var8 + var7 * var5 >> 11; @@ -1075,7 +1076,7 @@ public class WorldMapRegion { var13.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); var13.packetBuffer.writeByte(var4); var13.packetBuffer.writeByte(var5); - var13.packetBuffer.writeShort(Client.minimapOrientation); + var13.packetBuffer.writeShort(Client.camAngleY); var13.packetBuffer.writeByte(57); var13.packetBuffer.writeByte(0); var13.packetBuffer.writeByte(0); @@ -1102,7 +1103,7 @@ public class WorldMapRegion { Widget var6 = var0[var5]; if (var6 != null && var6.parentId == var1) { WorldMapSection3.alignWidgetSize(var6, var2, var3, var4); - OverlayDefinition.alignWidgetPosition(var6, var2, var3); + FloorOverlayDefinition.alignWidgetPosition(var6, var2, var3); if (var6.scrollX > var6.scrollWidth - var6.width) { var6.scrollX = var6.scrollWidth - var6.width; } diff --git a/runescape-client/src/main/java/WorldMapSection.java b/runescape-client/src/main/java/WorldMapSection.java index 8765e6c253..3e7942dc74 100644 --- a/runescape-client/src/main/java/WorldMapSection.java +++ b/runescape-client/src/main/java/WorldMapSection.java @@ -12,7 +12,7 @@ public interface WorldMapSection { garbageValue = "1384899025" ) @Export("expandBounds") - void expandBounds(WorldMapArea var1); + void expandBounds(WorldMapArea area); @ObfuscatedName("f") @ObfuscatedSignature( @@ -20,7 +20,7 @@ public interface WorldMapSection { garbageValue = "93" ) @Export("containsCoord") - boolean containsCoord(int var1, int var2, int var3); + boolean containsCoord(int plane, int x, int y); @ObfuscatedName("q") @ObfuscatedSignature( @@ -28,7 +28,7 @@ public interface WorldMapSection { garbageValue = "4" ) @Export("containsPosition") - boolean containsPosition(int var1, int var2); + boolean containsPosition(int x, int y); @ObfuscatedName("w") @ObfuscatedSignature( @@ -36,7 +36,7 @@ public interface WorldMapSection { garbageValue = "1545934424" ) @Export("position") - int[] position(int var1, int var2, int var3); + int[] position(int plane, int x, int y); @ObfuscatedName("o") @ObfuscatedSignature( @@ -44,7 +44,7 @@ public interface WorldMapSection { garbageValue = "-1916486802" ) @Export("coord") - TileLocation coord(int var1, int var2); + Coord coord(int x, int y); @ObfuscatedName("u") @ObfuscatedSignature( @@ -52,5 +52,5 @@ public interface WorldMapSection { garbageValue = "-113" ) @Export("read") - void read(Buffer var1); + void read(Buffer buffer); } diff --git a/runescape-client/src/main/java/WorldMapSection0.java b/runescape-client/src/main/java/WorldMapSection0.java index 580063b608..9314fc62b0 100644 --- a/runescape-client/src/main/java/WorldMapSection0.java +++ b/runescape-client/src/main/java/WorldMapSection0.java @@ -151,13 +151,13 @@ public class WorldMapSection0 implements WorldMapSection { garbageValue = "-1916486802" ) @Export("coord") - public TileLocation coord(int var1, int var2) { + public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { return null; } else { int var3 = this.field1059 * 64 - this.field1061 * 64 + (this.field1063 * 8 - this.field1067 * 8) + var1; int var4 = this.field1060 * 64 - this.field1062 * 64 + var2 + (this.field1064 * 8 - this.field1068 * 8); - return new TileLocation(this.field1057, var3, var4); + return new Coord(this.field1057, var3, var4); } } diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java index 9b7aae46ca..201ac1b868 100644 --- a/runescape-client/src/main/java/WorldMapSection1.java +++ b/runescape-client/src/main/java/WorldMapSection1.java @@ -14,8 +14,8 @@ public class WorldMapSection1 implements WorldMapSection { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache15") - static IndexCache indexCache15; + @Export("archive15") + static Archive archive15; @ObfuscatedName("ey") @ObfuscatedGetter( intValue = -1516124929 @@ -144,13 +144,13 @@ public class WorldMapSection1 implements WorldMapSection { garbageValue = "-1916486802" ) @Export("coord") - public TileLocation coord(int var1, int var2) { + public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { return null; } else { int var3 = this.field1074 * 64 - this.field1076 * 64 + (this.field1078 * 8 - this.field1080 * 8) + var1; int var4 = this.field1075 * 64 - this.field1077 * 64 + var2 + (this.field1079 * 8 - this.field1081 * 8); - return new TileLocation(this.field1072, var3, var4); + return new Coord(this.field1072, var3, var4); } } @@ -193,10 +193,10 @@ public class WorldMapSection1 implements WorldMapSection { if (var1 != null) { return var1; } else { - byte[] var2 = KitDefinition.KitDefinition_indexCache.takeRecord(3, var0); + byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); var1 = new KitDefinition(); if (var2 != null) { - var1.read(new Buffer(var2)); + var1.decode(new Buffer(var2)); } KitDefinition.KitDefinition_cached.put(var1, (long)var0); @@ -234,7 +234,7 @@ public class WorldMapSection1 implements WorldMapSection { Client.isItemSelected = 0; Client.isSpellSelected = false; Client.soundEffectCount = 0; - Client.minimapOrientation = 0; + Client.camAngleY = 0; Client.oculusOrbState = 0; ClientParameter.field3645 = null; Client.minimapState = 0; @@ -285,16 +285,16 @@ public class WorldMapSection1 implements WorldMapSection { class196.varcs.clearTransient(); Client.followerIndex = -1; - if (Client.rootWidgetGroup != -1) { - AbstractByteArrayCopier.unloadWidgetGroup(Client.rootWidgetGroup); + if (Client.rootInterface != -1) { + AbstractByteArrayCopier.unloadInterface(Client.rootInterface); } - for (WidgetGroupParent var4 = (WidgetGroupParent)Client.widgetGroupParents.first(); var4 != null; var4 = (WidgetGroupParent)Client.widgetGroupParents.next()) { - MenuAction.closeWidgetGroup(var4, true); + for (InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.first(); var4 != null; var4 = (InterfaceParent)Client.interfaceParents.next()) { + MenuAction.closeInterface(var4, true); } - Client.rootWidgetGroup = -1; - Client.widgetGroupParents = new NodeHashTable(8); + Client.rootInterface = -1; + Client.interfaceParents = new NodeHashTable(8); Client.field127 = null; Client.menuOptionsCount = 0; Client.isMenuOpen = false; diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java index 7be549d5f2..f90d0505ca 100644 --- a/runescape-client/src/main/java/WorldMapSection2.java +++ b/runescape-client/src/main/java/WorldMapSection2.java @@ -109,13 +109,13 @@ public class WorldMapSection2 implements WorldMapSection { garbageValue = "-1916486802" ) @Export("coord") - public TileLocation coord(int var1, int var2) { + public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { return null; } else { int var3 = this.field1085 * 64 - this.field1087 * 64 + var1; int var4 = this.field1086 * 64 - this.field1088 * 64 + var2; - return new TileLocation(this.field1083, var3, var4); + return new Coord(this.field1083, var3, var4); } } @@ -151,9 +151,9 @@ public class WorldMapSection2 implements WorldMapSection { @Export("getVarbit") public static int getVarbit(int var0) { VarbitDefinition var1 = Occluder.method3255(var0); - int var2 = var1.varp; - int var3 = var1.lowBit; - int var4 = var1.highBit; + int var2 = var1.baseVar; + int var3 = var1.startBit; + int var4 = var1.endBit; int var5 = Varps.Varps_masks[var4 - var3]; return Varps.Varps_main[var2] >> var3 & var5; } @@ -175,91 +175,91 @@ public class WorldMapSection2 implements WorldMapSection { byte var10 = 0; int var11 = 0; class178.bufferX[var10] = var0; - int var13 = var10 + 1; + int var12 = var10 + 1; class178.bufferY[var10] = var1; - int[][] var14 = var3.flags; + int[][] var13 = var3.flags; - while (var13 != var11) { + while (var12 != var11) { var4 = class178.bufferX[var11]; var5 = class178.bufferY[var11]; var11 = var11 + 1 & 4095; - int var15 = var4 - var8; - int var16 = var5 - var9; - int var17 = var4 - var3.xInset; - int var18 = var5 - var3.yInset; + int var14 = var4 - var8; + int var15 = var5 - var9; + int var16 = var4 - var3.xInset; + int var17 = var5 - var3.yInset; if (var2.vmethod3644(2, var4, var5, var3)) { - WidgetGroupParent.field986 = var4; + InterfaceParent.field986 = var4; UrlRequester.field929 = var5; return true; } - int var19 = class178.distances[var15][var16] + 1; - if (var15 > 0 && class178.directions[var15 - 1][var16] == 0 && (var14[var17 - 1][var18] & 19136782) == 0 && (var14[var17 - 1][var18 + 1] & 19136824) == 0) { - class178.bufferX[var13] = var4 - 1; - class178.bufferY[var13] = var5; - var13 = var13 + 1 & 4095; - class178.directions[var15 - 1][var16] = 2; - class178.distances[var15 - 1][var16] = var19; + int var18 = class178.distances[var14][var15] + 1; + if (var14 > 0 && class178.directions[var14 - 1][var15] == 0 && (var13[var16 - 1][var17] & 19136782) == 0 && (var13[var16 - 1][var17 + 1] & 19136824) == 0) { + class178.bufferX[var12] = var4 - 1; + class178.bufferY[var12] = var5; + var12 = var12 + 1 & 4095; + class178.directions[var14 - 1][var15] = 2; + class178.distances[var14 - 1][var15] = var18; } - if (var15 < 126 && class178.directions[var15 + 1][var16] == 0 && (var14[var17 + 2][var18] & 19136899) == 0 && (var14[var17 + 2][var18 + 1] & 19136992) == 0) { - class178.bufferX[var13] = var4 + 1; - class178.bufferY[var13] = var5; - var13 = var13 + 1 & 4095; - class178.directions[var15 + 1][var16] = 8; - class178.distances[var15 + 1][var16] = var19; + if (var14 < 126 && class178.directions[var14 + 1][var15] == 0 && (var13[var16 + 2][var17] & 19136899) == 0 && (var13[var16 + 2][var17 + 1] & 19136992) == 0) { + class178.bufferX[var12] = var4 + 1; + class178.bufferY[var12] = var5; + var12 = var12 + 1 & 4095; + class178.directions[var14 + 1][var15] = 8; + class178.distances[var14 + 1][var15] = var18; } - if (var16 > 0 && class178.directions[var15][var16 - 1] == 0 && (var14[var17][var18 - 1] & 19136782) == 0 && (var14[var17 + 1][var18 - 1] & 19136899) == 0) { - class178.bufferX[var13] = var4; - class178.bufferY[var13] = var5 - 1; - var13 = var13 + 1 & 4095; - class178.directions[var15][var16 - 1] = 1; - class178.distances[var15][var16 - 1] = var19; + if (var15 > 0 && class178.directions[var14][var15 - 1] == 0 && (var13[var16][var17 - 1] & 19136782) == 0 && (var13[var16 + 1][var17 - 1] & 19136899) == 0) { + class178.bufferX[var12] = var4; + class178.bufferY[var12] = var5 - 1; + var12 = var12 + 1 & 4095; + class178.directions[var14][var15 - 1] = 1; + class178.distances[var14][var15 - 1] = var18; } - if (var16 < 126 && class178.directions[var15][var16 + 1] == 0 && (var14[var17][var18 + 2] & 19136824) == 0 && (var14[var17 + 1][var18 + 2] & 19136992) == 0) { - class178.bufferX[var13] = var4; - class178.bufferY[var13] = var5 + 1; - var13 = var13 + 1 & 4095; - class178.directions[var15][var16 + 1] = 4; - class178.distances[var15][var16 + 1] = var19; + if (var15 < 126 && class178.directions[var14][var15 + 1] == 0 && (var13[var16][var17 + 2] & 19136824) == 0 && (var13[var16 + 1][var17 + 2] & 19136992) == 0) { + class178.bufferX[var12] = var4; + class178.bufferY[var12] = var5 + 1; + var12 = var12 + 1 & 4095; + class178.directions[var14][var15 + 1] = 4; + class178.distances[var14][var15 + 1] = var18; } - if (var15 > 0 && var16 > 0 && class178.directions[var15 - 1][var16 - 1] == 0 && (var14[var17 - 1][var18] & 19136830) == 0 && (var14[var17 - 1][var18 - 1] & 19136782) == 0 && (var14[var17][var18 - 1] & 19136911) == 0) { - class178.bufferX[var13] = var4 - 1; - class178.bufferY[var13] = var5 - 1; - var13 = var13 + 1 & 4095; - class178.directions[var15 - 1][var16 - 1] = 3; - class178.distances[var15 - 1][var16 - 1] = var19; + if (var14 > 0 && var15 > 0 && class178.directions[var14 - 1][var15 - 1] == 0 && (var13[var16 - 1][var17] & 19136830) == 0 && (var13[var16 - 1][var17 - 1] & 19136782) == 0 && (var13[var16][var17 - 1] & 19136911) == 0) { + class178.bufferX[var12] = var4 - 1; + class178.bufferY[var12] = var5 - 1; + var12 = var12 + 1 & 4095; + class178.directions[var14 - 1][var15 - 1] = 3; + class178.distances[var14 - 1][var15 - 1] = var18; } - if (var15 < 126 && var16 > 0 && class178.directions[var15 + 1][var16 - 1] == 0 && (var14[var17 + 1][var18 - 1] & 19136911) == 0 && (var14[var17 + 2][var18 - 1] & 19136899) == 0 && (var14[var17 + 2][var18] & 19136995) == 0) { - class178.bufferX[var13] = var4 + 1; - class178.bufferY[var13] = var5 - 1; - var13 = var13 + 1 & 4095; - class178.directions[var15 + 1][var16 - 1] = 9; - class178.distances[var15 + 1][var16 - 1] = var19; + if (var14 < 126 && var15 > 0 && class178.directions[var14 + 1][var15 - 1] == 0 && (var13[var16 + 1][var17 - 1] & 19136911) == 0 && (var13[var16 + 2][var17 - 1] & 19136899) == 0 && (var13[var16 + 2][var17] & 19136995) == 0) { + class178.bufferX[var12] = var4 + 1; + class178.bufferY[var12] = var5 - 1; + var12 = var12 + 1 & 4095; + class178.directions[var14 + 1][var15 - 1] = 9; + class178.distances[var14 + 1][var15 - 1] = var18; } - if (var15 > 0 && var16 < 126 && class178.directions[var15 - 1][var16 + 1] == 0 && (var14[var17 - 1][var18 + 1] & 19136830) == 0 && (var14[var17 - 1][var18 + 2] & 19136824) == 0 && (var14[var17][var18 + 2] & 19137016) == 0) { - class178.bufferX[var13] = var4 - 1; - class178.bufferY[var13] = var5 + 1; - var13 = var13 + 1 & 4095; - class178.directions[var15 - 1][var16 + 1] = 6; - class178.distances[var15 - 1][var16 + 1] = var19; + if (var14 > 0 && var15 < 126 && class178.directions[var14 - 1][var15 + 1] == 0 && (var13[var16 - 1][var17 + 1] & 19136830) == 0 && (var13[var16 - 1][var17 + 2] & 19136824) == 0 && (var13[var16][var17 + 2] & 19137016) == 0) { + class178.bufferX[var12] = var4 - 1; + class178.bufferY[var12] = var5 + 1; + var12 = var12 + 1 & 4095; + class178.directions[var14 - 1][var15 + 1] = 6; + class178.distances[var14 - 1][var15 + 1] = var18; } - if (var15 < 126 && var16 < 126 && class178.directions[var15 + 1][var16 + 1] == 0 && (var14[var17 + 1][var18 + 2] & 19137016) == 0 && (var14[var17 + 2][var18 + 2] & 19136992) == 0 && (var14[var17 + 2][var18 + 1] & 19136995) == 0) { - class178.bufferX[var13] = var4 + 1; - class178.bufferY[var13] = var5 + 1; - var13 = var13 + 1 & 4095; - class178.directions[var15 + 1][var16 + 1] = 12; - class178.distances[var15 + 1][var16 + 1] = var19; + if (var14 < 126 && var15 < 126 && class178.directions[var14 + 1][var15 + 1] == 0 && (var13[var16 + 1][var17 + 2] & 19137016) == 0 && (var13[var16 + 2][var17 + 2] & 19136992) == 0 && (var13[var16 + 2][var17 + 1] & 19136995) == 0) { + class178.bufferX[var12] = var4 + 1; + class178.bufferY[var12] = var5 + 1; + var12 = var12 + 1 & 4095; + class178.directions[var14 + 1][var15 + 1] = 12; + class178.distances[var14 + 1][var15 + 1] = var18; } } - WidgetGroupParent.field986 = var4; + InterfaceParent.field986 = var4; UrlRequester.field929 = var5; return false; } @@ -307,7 +307,7 @@ public class WorldMapSection2 implements WorldMapSection { } if (!var4) { - WorldMapIcon1.method219(4, "", "Unable to find " + var1); + WorldMapIcon1.addGameMessage(4, "", "Unable to find " + var1); } } diff --git a/runescape-client/src/main/java/WorldMapSection3.java b/runescape-client/src/main/java/WorldMapSection3.java index a3dc383399..3122fa5e65 100644 --- a/runescape-client/src/main/java/WorldMapSection3.java +++ b/runescape-client/src/main/java/WorldMapSection3.java @@ -14,8 +14,8 @@ public class WorldMapSection3 implements WorldMapSection { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache8") - static IndexCache indexCache8; + @Export("archive8") + static Archive archive8; @ObfuscatedName("go") @ObfuscatedGetter( intValue = -948290091 @@ -138,13 +138,13 @@ public class WorldMapSection3 implements WorldMapSection { garbageValue = "-1916486802" ) @Export("coord") - public TileLocation coord(int var1, int var2) { + public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { return null; } else { int var3 = this.field1092 * 64 - this.field1096 * 64 + var1; int var4 = this.field1093 * 64 - this.field1097 * 64 + var2; - return new TileLocation(this.field1090, var3, var4); + return new Coord(this.field1090, var3, var4); } } @@ -200,8 +200,8 @@ public class WorldMapSection3 implements WorldMapSection { ) @Export("runWidgetOnLoadListener") static void runWidgetOnLoadListener(int var0) { - if (var0 != -1 && GroundItemPile.loadWidgetGroup(var0)) { - Widget[] var1 = Widget.widgets[var0]; + if (var0 != -1 && GroundItemPile.loadInterface(var0)) { + Widget[] var1 = Widget.interfaceComponents[var0]; for (int var2 = 0; var2 < var1.length; ++var2) { Widget var3 = var1[var2]; @@ -222,41 +222,41 @@ public class WorldMapSection3 implements WorldMapSection { garbageValue = "-35" ) @Export("alignWidgetSize") - static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) { - int var4 = var0.width; - int var5 = var0.height; - if (var0.widthAlignment == 0) { - var0.width = var0.rawWidth; - } else if (var0.widthAlignment == 1) { - var0.width = var1 - var0.rawWidth; - } else if (var0.widthAlignment == 2) { - var0.width = var0.rawWidth * var1 >> 14; + static void alignWidgetSize(Widget component, int parentWidth, int parentHeight, boolean var3) { + int var4 = component.width; + int var5 = component.height; + if (component.widthAlignment == 0) { + component.width = component.rawWidth; + } else if (component.widthAlignment == 1) { + component.width = parentWidth - component.rawWidth; + } else if (component.widthAlignment == 2) { + component.width = component.rawWidth * parentWidth >> 14; } - if (var0.heightAlignment == 0) { - var0.height = var0.rawHeight; - } else if (var0.heightAlignment == 1) { - var0.height = var2 - var0.rawHeight; - } else if (var0.heightAlignment == 2) { - var0.height = var2 * var0.rawHeight >> 14; + if (component.heightAlignment == 0) { + component.height = component.rawHeight; + } else if (component.heightAlignment == 1) { + component.height = parentHeight - component.rawHeight; + } else if (component.heightAlignment == 2) { + component.height = parentHeight * component.rawHeight >> 14; } - if (var0.widthAlignment == 4) { - var0.width = var0.height * var0.field958 / var0.field959; + if (component.widthAlignment == 4) { + component.width = component.height * component.field958 / component.field959; } - if (var0.heightAlignment == 4) { - var0.height = var0.width * var0.field959 / var0.field958; + if (component.heightAlignment == 4) { + component.height = component.width * component.field959 / component.field958; } - if (var0.contentType == 1337) { - Client.viewportWidget = var0; + if (component.contentType == 1337) { + Client.viewportWidget = component; } - if (var3 && var0.field975 != null && (var4 != var0.width || var5 != var0.height)) { + if (var3 && component.onResize != null && (var4 != component.width || var5 != component.height)) { ScriptEvent var6 = new ScriptEvent(); - var6.widget = var0; - var6.args0 = var0.field975; + var6.widget = component; + var6.args0 = component.onResize; Client.scriptEvents.addFirst(var6); } diff --git a/runescape-client/src/main/java/WorldMapSectionType.java b/runescape-client/src/main/java/WorldMapSectionType.java index 9e31cd962e..f22ace252c 100644 --- a/runescape-client/src/main/java/WorldMapSectionType.java +++ b/runescape-client/src/main/java/WorldMapSectionType.java @@ -4,6 +4,7 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("h") @Implements("WorldMapSectionType") @@ -86,9 +87,10 @@ public enum WorldMapSectionType implements Enumerated { signature = "(IZIZI)V", garbageValue = "2102950996" ) - static void method248(int var0, boolean var1, int var2, boolean var3) { + @Export("sortWorlds") + static void sortWorlds(int primaryMode, boolean primaryReversed, int secondaryMode, boolean secondaryReversed) { if (ItemContainer.worlds != null) { - class3.method42(0, ItemContainer.worlds.length - 1, var0, var1, var2, var3); + class3.doWorldSorting(0, ItemContainer.worlds.length - 1, primaryMode, primaryReversed, secondaryMode, secondaryReversed); } } @@ -99,23 +101,23 @@ public enum WorldMapSectionType implements Enumerated { garbageValue = "-1520594673" ) static int method253(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111; - if (var0 == 1500) { + Widget var3 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111; + if (var0 == ScriptOpcodes.CC_GETX) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.x; return 1; - } else if (var0 == 1501) { + } else if (var0 == ScriptOpcodes.CC_GETY) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.y; return 1; - } else if (var0 == 1502) { + } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.width; return 1; - } else if (var0 == 1503) { + } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.height; return 1; - } else if (var0 == 1504) { + } else if (var0 == ScriptOpcodes.CC_GETHIDE) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; return 1; - } else if (var0 == 1505) { + } else if (var0 == ScriptOpcodes.CC_GETLAYER) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.parentId; return 1; } else { diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java index 3f186cdad6..7a52970d1d 100644 --- a/runescape-client/src/main/java/class1.java +++ b/runescape-client/src/main/java/class1.java @@ -1,6 +1,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("f") final class class1 implements class0 { @@ -8,7 +9,7 @@ final class class1 implements class0 { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field1105; + public static AbstractArchive field1105; @ObfuscatedName("m") @ObfuscatedSignature( @@ -83,10 +84,10 @@ final class class1 implements class0 { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var4 = Huffman.getWidget(var3); } else { - var4 = var2 ? WorldMapIcon1.field1030 : class12.field1111; + var4 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111; } - if (var0 == 1000) { + if (var0 == ScriptOpcodes.CC_SETPOSITION) { RouteStrategy.Interpreter_intStackSize -= 4; var4.rawX = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4.rawY = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; @@ -95,11 +96,11 @@ final class class1 implements class0 { class22.method295(var4); TextureProvider.client.alignWidget(var4); if (var3 != -1 && var4.type == 0) { - class39.revalidateWidgetScroll(Widget.widgets[var3 >> 16], var4, false); + class39.revalidateWidgetScroll(Widget.interfaceComponents[var3 >> 16], var4, false); } return 1; - } else if (var0 == 1001) { + } else if (var0 == ScriptOpcodes.CC_SETSIZE) { RouteStrategy.Interpreter_intStackSize -= 4; var4.rawWidth = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4.rawHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; @@ -108,11 +109,11 @@ final class class1 implements class0 { class22.method295(var4); TextureProvider.client.alignWidget(var4); if (var3 != -1 && var4.type == 0) { - class39.revalidateWidgetScroll(Widget.widgets[var3 >> 16], var4, false); + class39.revalidateWidgetScroll(Widget.interfaceComponents[var3 >> 16], var4, false); } return 1; - } else if (var0 == 1003) { + } else if (var0 == ScriptOpcodes.CC_SETHIDE) { boolean var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; if (var5 != var4.isHidden) { var4.isHidden = var5; @@ -120,10 +121,10 @@ final class class1 implements class0 { } return 1; - } else if (var0 == 1005) { + } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { var4.noClickThrough = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; - } else if (var0 == 1006) { + } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { var4.noScrollThrough = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; } else { @@ -138,14 +139,14 @@ final class class1 implements class0 { ) static int method16(int var0, Script var1, boolean var2) { int var3; - if (var0 == 4200) { + if (var0 == ScriptOpcodes.OC_NAME) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Skills.getItemDefinition(var3).name; return 1; } else { int var4; ItemDefinition var5; - if (var0 == 4201) { + if (var0 == ScriptOpcodes.OC_OP) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; @@ -157,7 +158,7 @@ final class class1 implements class0 { } return 1; - } else if (var0 == 4202) { + } else if (var0 == ScriptOpcodes.OC_IOP) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; @@ -169,17 +170,17 @@ final class class1 implements class0 { } return 1; - } else if (var0 == 4203) { + } else if (var0 == ScriptOpcodes.OC_COST) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var3).price; return 1; - } else if (var0 == 4204) { + } else if (var0 == ScriptOpcodes.OC_STACKABLE) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var3).isStackable == 1 ? 1 : 0; return 1; } else { ItemDefinition var6; - if (var0 == 4205) { + if (var0 == ScriptOpcodes.OC_CERT) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = Skills.getItemDefinition(var3); if (var6.noteTemplate == -1 && var6.note >= 0) { @@ -189,7 +190,7 @@ final class class1 implements class0 { } return 1; - } else if (var0 == 4206) { + } else if (var0 == ScriptOpcodes.OC_UNCERT) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = Skills.getItemDefinition(var3); if (var6.noteTemplate >= 0 && var6.note >= 0) { @@ -199,11 +200,11 @@ final class class1 implements class0 { } return 1; - } else if (var0 == 4207) { + } else if (var0 == ScriptOpcodes.OC_MEMBERS) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var3).isMembersOnly ? 1 : 0; return 1; - } else if (var0 == 4208) { + } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = Skills.getItemDefinition(var3); if (var6.placeholderTemplate == -1 && var6.placeholder >= 0) { @@ -213,7 +214,7 @@ final class class1 implements class0 { } return 1; - } else if (var0 == 4209) { + } else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = Skills.getItemDefinition(var3); if (var6.placeholderTemplate >= 0 && var6.placeholder >= 0) { @@ -223,14 +224,14 @@ final class class1 implements class0 { } return 1; - } else if (var0 == 4210) { + } else if (var0 == ScriptOpcodes.OC_FIND) { String var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; class50.method900(var7, var4 == 1); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapSection0.field1055; return 1; - } else if (var0 != 4211) { - if (var0 == 4212) { + } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { + if (var0 == ScriptOpcodes.OC_FINDRESET) { WorldMapDecorationType.field1139 = 0; return 1; } else { @@ -270,8 +271,8 @@ final class class1 implements class0 { garbageValue = "1809366429" ) @Export("getWidgetClickMask") - static int getWidgetClickMask(Widget var0) { - IntegerNode var1 = (IntegerNode)Client.widgetClickMasks.get(((long)var0.id << 32) + (long)var0.childIndex); - return var1 != null ? var1.integer : var0.clickMask; + static int getWidgetClickMask(Widget component) { + IntegerNode var1 = (IntegerNode)Client.widgetClickMasks.get(((long)component.id << 32) + (long)component.childIndex); + return var1 != null ? var1.integer : component.clickMask; } } diff --git a/runescape-client/src/main/java/class13.java b/runescape-client/src/main/java/class13.java index 4da7663662..fb13bb6aae 100644 --- a/runescape-client/src/main/java/class13.java +++ b/runescape-client/src/main/java/class13.java @@ -36,8 +36,8 @@ public class class13 { ) @Export("playPcmPlayers") static final void playPcmPlayers() { - if (AbstractIndexCache.pcmPlayer1 != null) { - AbstractIndexCache.pcmPlayer1.run(); + if (AbstractArchive.pcmPlayer1 != null) { + AbstractArchive.pcmPlayer1.run(); } if (WorldMapCacheName.pcmPlayer0 != null) { @@ -57,23 +57,23 @@ public class class13 { int var4 = 0; int var5 = 0; if (var0.type == 0) { - var1 = class65.scene.method290(var0.level, var0.x, var0.y); + var1 = class65.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); } if (var0.type == 1) { - var1 = class65.scene.method291(var0.level, var0.x, var0.y); + var1 = class65.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); } if (var0.type == 2) { - var1 = class65.scene.method292(var0.level, var0.x, var0.y); + var1 = class65.scene.getGameObjectTag(var0.plane, var0.x, var0.y); } if (var0.type == 3) { - var1 = class65.scene.getFloorDecorationTag(var0.level, var0.x, var0.y); + var1 = class65.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); } if (var1 != 0L) { - int var6 = class65.scene.getObjectFlags(var0.level, var0.x, var0.y, var1); + int var6 = class65.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); var3 = HitSplatDefinition.method4972(var1); var4 = var6 & 31; var5 = var6 >> 6 & 3; diff --git a/runescape-client/src/main/java/class15.java b/runescape-client/src/main/java/class15.java index 0b07ec0546..d8eb31073f 100644 --- a/runescape-client/src/main/java/class15.java +++ b/runescape-client/src/main/java/class15.java @@ -2,6 +2,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("z") public class class15 extends class21 { @@ -121,11 +122,11 @@ public class class15 extends class21 { ) static int method182(int var0, Script var1, boolean var2) { Widget var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); - if (var0 == 2800) { + if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class211.method4107(class1.getWidgetClickMask(var3)); return 1; - } else if (var0 != 2801) { - if (var0 == 2802) { + } else if (var0 != ScriptOpcodes.IF_GETOP) { + if (var0 == ScriptOpcodes.IF_GETOPBASE) { if (var3.dataText == null) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; } else { diff --git a/runescape-client/src/main/java/class159.java b/runescape-client/src/main/java/class159.java index 658ded8e00..58d72f6461 100644 --- a/runescape-client/src/main/java/class159.java +++ b/runescape-client/src/main/java/class159.java @@ -35,11 +35,12 @@ public enum class159 implements Enumerated { @ObfuscatedGetter( intValue = 458308007 ) - final int field1981; + @Export("id") + final int id; private class159(int var3, int var4) { this.field1984 = var3; - this.field1981 = var4; + this.id = var4; } @ObfuscatedName("f") @@ -49,7 +50,7 @@ public enum class159 implements Enumerated { ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field1981; + return this.id; } @ObfuscatedName("d") @@ -57,7 +58,8 @@ public enum class159 implements Enumerated { signature = "(CI)Z", garbageValue = "1176730001" ) - public static boolean method3394(char var0) { + @Export("isCharDigit") + public static boolean isCharDigit(char var0) { return var0 >= '0' && var0 <= '9'; } } diff --git a/runescape-client/src/main/java/class16.java b/runescape-client/src/main/java/class16.java index 07eddf838a..6b30dbe49d 100644 --- a/runescape-client/src/main/java/class16.java +++ b/runescape-client/src/main/java/class16.java @@ -1,6 +1,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("j") public class class16 { @@ -20,8 +21,8 @@ public class class16 { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache10") - static IndexCache indexCache10; + @Export("archive10") + static Archive archive10; @ObfuscatedName("ga") @ObfuscatedSignature( signature = "[Lln;" @@ -61,12 +62,12 @@ public class class16 { garbageValue = "1394688825" ) static int method188(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111; - if (var0 == 1800) { + Widget var3 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111; + if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class211.method4107(class1.getWidgetClickMask(var3)); return 1; - } else if (var0 != 1801) { - if (var0 == 1802) { + } else if (var0 != ScriptOpcodes.CC_GETOP) { + if (var0 == ScriptOpcodes.CC_GETOPBASE) { if (var3.dataText == null) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; } else { @@ -293,24 +294,24 @@ public class class16 { } } } else { - NodeDeque var38; - GroundItem var41; + GroundItem var38; + NodeDeque var40; if (class190.field2347 == var0) { var31 = var1.method58(); var2 = (var31 >> 4 & 7) + WorldMapSection3.field1089; var32 = (var31 & 7) + Canvas.field95; var3 = var1.method67(); if (var2 >= 0 && var32 >= 0 && var2 < 104 && var32 < 104) { - var38 = Client.groundItems[SoundSystem.plane][var2][var32]; - if (var38 != null) { - for (var41 = (GroundItem)var38.last(); var41 != null; var41 = (GroundItem)var38.previous()) { - if ((var3 & 32767) == var41.id) { - var41.remove(); + var40 = Client.groundItems[SoundSystem.plane][var2][var32]; + if (var40 != null) { + for (var38 = (GroundItem)var40.last(); var38 != null; var38 = (GroundItem)var40.previous()) { + if ((var3 & 32767) == var38.id) { + var38.remove(); break; } } - if (var38.last() == null) { + if (var40.last() == null) { Client.groundItems[SoundSystem.plane][var2][var32] = null; } @@ -341,17 +342,17 @@ public class class16 { var35 = (var8 >> 4 & 7) + WorldMapSection3.field1089; var9 = (var8 & 7) + Canvas.field95; var10 = var1.method60(); - byte var40 = var1.method61(); - var11 = var40 + var35; + byte var41 = var1.method61(); + var11 = var41 + var35; int var42 = var10 + var9; if (var35 >= 0 && var9 >= 0 && var35 < 104 && var9 < 104 && var11 >= 0 && var42 >= 0 && var11 < 104 && var42 < 104 && var32 != 65535) { var35 = var35 * 128 + 64; var9 = var9 * 128 + 64; var11 = var11 * 128 + 64; var42 = var42 * 128 + 64; - Projectile var43 = new Projectile(var32, SoundSystem.plane, var35, var9, class32.getTileHeight(var35, var9, SoundSystem.plane) - var3, var7 + Client.cycle, var2 + Client.cycle, var5, var6, var4, var31); - var43.setDestination(var11, var42, class32.getTileHeight(var11, var42, SoundSystem.plane) - var31, var7 + Client.cycle); - Client.projectiles.addFirst(var43); + Projectile var44 = new Projectile(var32, SoundSystem.plane, var35, var9, class32.getTileHeight(var35, var9, SoundSystem.plane) - var3, var7 + Client.cycle, var2 + Client.cycle, var5, var6, var4, var31); + var44.setDestination(var11, var42, class32.getTileHeight(var11, var42, SoundSystem.plane) - var31, var7 + Client.cycle); + Client.projectiles.addFirst(var44); } } else if (class190.field2346 != var0) { if (class190.field2343 == var0) { @@ -361,14 +362,14 @@ public class class16 { var3 = (var32 >> 4 & 7) + WorldMapSection3.field1089; var4 = (var32 & 7) + Canvas.field95; if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { - var41 = new GroundItem(); - var41.id = var2; - var41.quantity = var31; + var38 = new GroundItem(); + var38.id = var2; + var38.quantity = var31; if (Client.groundItems[SoundSystem.plane][var3][var4] == null) { Client.groundItems[SoundSystem.plane][var3][var4] = new NodeDeque(); } - Client.groundItems[SoundSystem.plane][var3][var4].addFirst(var41); + Client.groundItems[SoundSystem.plane][var3][var4].addFirst(var38); TilePaint.updateItemPile(var3, var4); } } @@ -380,11 +381,11 @@ public class class16 { var4 = (var3 >> 4 & 7) + WorldMapSection3.field1089; var5 = (var3 & 7) + Canvas.field95; if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { - var38 = Client.groundItems[SoundSystem.plane][var4][var5]; - if (var38 != null) { - for (GroundItem var44 = (GroundItem)var38.last(); var44 != null; var44 = (GroundItem)var38.previous()) { - if ((var31 & 32767) == var44.id && var32 == var44.quantity) { - var44.quantity = var2; + var40 = Client.groundItems[SoundSystem.plane][var4][var5]; + if (var40 != null) { + for (GroundItem var43 = (GroundItem)var40.last(); var43 != null; var43 = (GroundItem)var40.previous()) { + if ((var31 & 32767) == var43.id && var32 == var43.quantity) { + var43.quantity = var2; break; } } @@ -405,11 +406,11 @@ public class class16 { garbageValue = "0" ) @Export("insertMenuItem") - static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) { + static final void insertMenuItem(String action, String targetName, int opcode, int var3, int var4, int var5, boolean var6) { if (!Client.isMenuOpen && Client.menuOptionsCount < 500) { - Client.menuActions[Client.menuOptionsCount] = var0; - Client.menuTargetNames[Client.menuOptionsCount] = var1; - Client.menuOpcodes[Client.menuOptionsCount] = var2; + Client.menuActions[Client.menuOptionsCount] = action; + Client.menuTargetNames[Client.menuOptionsCount] = targetName; + Client.menuOpcodes[Client.menuOptionsCount] = opcode; Client.menuArguments0[Client.menuOptionsCount] = var3; Client.menuArguments1[Client.menuOptionsCount] = var4; Client.menuArguments2[Client.menuOptionsCount] = var5; diff --git a/runescape-client/src/main/java/class171.java b/runescape-client/src/main/java/class171.java index 2ae59d52fe..51e80c8a4b 100644 --- a/runescape-client/src/main/java/class171.java +++ b/runescape-client/src/main/java/class171.java @@ -90,7 +90,7 @@ public class class171 { Client.collisionMaps[var0] = new CollisionMap(104, 104); } - WidgetGroupParent.sceneMinimapSprite = new Sprite(512, 512); + InterfaceParent.sceneMinimapSprite = new Sprite(512, 512); Login.Login_loadingText = "Starting game engine..."; Login.Login_loadingPercent = 5; Client.titleLoadingStage = 20; @@ -99,51 +99,51 @@ public class class171 { Login.Login_loadingPercent = 10; Client.titleLoadingStage = 30; } else if (Client.titleLoadingStage == 30) { - AbstractIndexCache.indexCache0 = class22.newIndexCache(0, false, true, true); - Skeleton.indexCache1 = class22.newIndexCache(1, false, true, true); - ObjectSound.indexCache2 = class22.newIndexCache(2, true, false, true); - WorldMapIcon1.indexCache3 = class22.newIndexCache(3, false, true, true); - WorldMapDecoration.indexCache4 = class22.newIndexCache(4, false, true, true); - SecureRandomFuture.indexCache5 = class22.newIndexCache(5, true, true, true); - UserComparator3.indexCache6 = class22.newIndexCache(6, true, true, true); - class40.indexCache7 = class22.newIndexCache(7, false, true, true); - WorldMapSection3.indexCache8 = class22.newIndexCache(8, false, true, true); - class238.indexCache9 = class22.newIndexCache(9, false, true, true); - class16.indexCache10 = class22.newIndexCache(10, false, true, true); - Login.indexCache11 = class22.newIndexCache(11, false, true, true); - Formatting.indexCache12 = class22.newIndexCache(12, false, true, true); - ByteArrayPool.indexCache13 = class22.newIndexCache(13, true, false, true); - class2.indexCache14 = class22.newIndexCache(14, false, true, true); - WorldMapSection1.indexCache15 = class22.newIndexCache(15, false, true, true); - class22.indexCache16 = class22.newIndexCache(17, true, true, true); - WorldMapLabelSize.field1040 = class22.newIndexCache(18, false, true, true); - ItemContainer.field434 = class22.newIndexCache(19, false, true, true); - AbstractByteArrayCopier.field0 = class22.newIndexCache(20, false, true, true); + AbstractArchive.archive0 = class22.newArchive(0, false, true, true); + Skeleton.archive1 = class22.newArchive(1, false, true, true); + ObjectSound.archive2 = class22.newArchive(2, true, false, true); + WorldMapIcon1.archive3 = class22.newArchive(3, false, true, true); + WorldMapDecoration.archive4 = class22.newArchive(4, false, true, true); + SecureRandomFuture.archive5 = class22.newArchive(5, true, true, true); + UserComparator3.archive6 = class22.newArchive(6, true, true, true); + class40.archive7 = class22.newArchive(7, false, true, true); + WorldMapSection3.archive8 = class22.newArchive(8, false, true, true); + class238.archive9 = class22.newArchive(9, false, true, true); + class16.archive10 = class22.newArchive(10, false, true, true); + Login.archive11 = class22.newArchive(11, false, true, true); + Formatting.archive12 = class22.newArchive(12, false, true, true); + ByteArrayPool.archive13 = class22.newArchive(13, true, false, true); + class2.archive14 = class22.newArchive(14, false, true, true); + WorldMapSection1.archive15 = class22.newArchive(15, false, true, true); + class22.archive16 = class22.newArchive(17, true, true, true); + WorldMapLabelSize.field1040 = class22.newArchive(18, false, true, true); + ItemContainer.field434 = class22.newArchive(19, false, true, true); + AbstractByteArrayCopier.field0 = class22.newArchive(20, false, true, true); Login.Login_loadingText = "Connecting to update server"; Login.Login_loadingPercent = 20; Client.titleLoadingStage = 40; } else if (Client.titleLoadingStage == 40) { byte var1 = 0; - var0 = var1 + AbstractIndexCache.indexCache0.method131() * 4 / 100; - var0 += Skeleton.indexCache1.method131() * 4 / 100; - var0 += ObjectSound.indexCache2.method131() * 2 / 100; - var0 += WorldMapIcon1.indexCache3.method131() * 2 / 100; - var0 += WorldMapDecoration.indexCache4.method131() * 6 / 100; - var0 += SecureRandomFuture.indexCache5.method131() * 4 / 100; - var0 += UserComparator3.indexCache6.method131() * 2 / 100; - var0 += class40.indexCache7.method131() * 56 / 100; - var0 += WorldMapSection3.indexCache8.method131() * 2 / 100; - var0 += class238.indexCache9.method131() * 2 / 100; - var0 += class16.indexCache10.method131() * 2 / 100; - var0 += Login.indexCache11.method131() * 2 / 100; - var0 += Formatting.indexCache12.method131() * 2 / 100; - var0 += ByteArrayPool.indexCache13.method131() * 2 / 100; - var0 += class2.indexCache14.method131() * 2 / 100; - var0 += WorldMapSection1.indexCache15.method131() * 2 / 100; - var0 += ItemContainer.field434.method131() / 100; - var0 += WorldMapLabelSize.field1040.method131() / 100; - var0 += AbstractByteArrayCopier.field0.method131() / 100; - var0 += class22.indexCache16.method130() && class22.indexCache16.method2() ? 1 : 0; + var0 = var1 + AbstractArchive.archive0.percentage() * 4 / 100; + var0 += Skeleton.archive1.percentage() * 4 / 100; + var0 += ObjectSound.archive2.percentage() * 2 / 100; + var0 += WorldMapIcon1.archive3.percentage() * 2 / 100; + var0 += WorldMapDecoration.archive4.percentage() * 6 / 100; + var0 += SecureRandomFuture.archive5.percentage() * 4 / 100; + var0 += UserComparator3.archive6.percentage() * 2 / 100; + var0 += class40.archive7.percentage() * 56 / 100; + var0 += WorldMapSection3.archive8.percentage() * 2 / 100; + var0 += class238.archive9.percentage() * 2 / 100; + var0 += class16.archive10.percentage() * 2 / 100; + var0 += Login.archive11.percentage() * 2 / 100; + var0 += Formatting.archive12.percentage() * 2 / 100; + var0 += ByteArrayPool.archive13.percentage() * 2 / 100; + var0 += class2.archive14.percentage() * 2 / 100; + var0 += WorldMapSection1.archive15.percentage() * 2 / 100; + var0 += ItemContainer.field434.percentage() / 100; + var0 += WorldMapLabelSize.field1040.percentage() / 100; + var0 += AbstractByteArrayCopier.field0.percentage() / 100; + var0 += class22.archive16.method130() && class22.archive16.method2() ? 1 : 0; if (var0 != 100) { if (var0 != 0) { Login.Login_loadingText = "Checking for updates - " + var0 + "%"; @@ -151,21 +151,21 @@ public class class171 { Login.Login_loadingPercent = 30; } else { - AbstractWorldMapIcon.method625(AbstractIndexCache.indexCache0, "Animations"); - AbstractWorldMapIcon.method625(Skeleton.indexCache1, "Skeletons"); - AbstractWorldMapIcon.method625(WorldMapDecoration.indexCache4, "Sound FX"); - AbstractWorldMapIcon.method625(SecureRandomFuture.indexCache5, "Maps"); - AbstractWorldMapIcon.method625(UserComparator3.indexCache6, "Music Tracks"); - AbstractWorldMapIcon.method625(class40.indexCache7, "Models"); - AbstractWorldMapIcon.method625(WorldMapSection3.indexCache8, "Sprites"); - AbstractWorldMapIcon.method625(Login.indexCache11, "Music Jingles"); - AbstractWorldMapIcon.method625(class2.indexCache14, "Music Samples"); - AbstractWorldMapIcon.method625(WorldMapSection1.indexCache15, "Music Patches"); + AbstractWorldMapIcon.method625(AbstractArchive.archive0, "Animations"); + AbstractWorldMapIcon.method625(Skeleton.archive1, "Skeletons"); + AbstractWorldMapIcon.method625(WorldMapDecoration.archive4, "Sound FX"); + AbstractWorldMapIcon.method625(SecureRandomFuture.archive5, "Maps"); + AbstractWorldMapIcon.method625(UserComparator3.archive6, "Music Tracks"); + AbstractWorldMapIcon.method625(class40.archive7, "Models"); + AbstractWorldMapIcon.method625(WorldMapSection3.archive8, "Sprites"); + AbstractWorldMapIcon.method625(Login.archive11, "Music Jingles"); + AbstractWorldMapIcon.method625(class2.archive14, "Music Samples"); + AbstractWorldMapIcon.method625(WorldMapSection1.archive15, "Music Patches"); AbstractWorldMapIcon.method625(ItemContainer.field434, "World Map"); AbstractWorldMapIcon.method625(WorldMapLabelSize.field1040, "World Map Geography"); AbstractWorldMapIcon.method625(AbstractByteArrayCopier.field0, "World Map Ground"); - class211.spriteIds = new SpriteIds(); - class211.spriteIds.read(class22.indexCache16); + class211.spriteIds = new GraphicsDefaults(); + class211.spriteIds.decode(class22.archive16); Login.Login_loadingText = "Loaded update list"; Login.Login_loadingPercent = 30; Client.titleLoadingStage = 45; @@ -176,15 +176,15 @@ public class class171 { var28.method174(9, 128); WorldMapCacheName.pcmPlayer0 = Players.newPcmPlayer(GameShell.taskHandler, 0, 22050); WorldMapCacheName.pcmPlayer0.setStream(var28); - NetSocket.method3537(WorldMapSection1.indexCache15, class2.indexCache14, WorldMapDecoration.indexCache4, var28); - AbstractIndexCache.pcmPlayer1 = Players.newPcmPlayer(GameShell.taskHandler, 1, 2048); + NetSocket.method3537(WorldMapSection1.archive15, class2.archive14, WorldMapDecoration.archive4, var28); + AbstractArchive.pcmPlayer1 = Players.newPcmPlayer(GameShell.taskHandler, 1, 2048); TaskHandler.pcmStreamMixer = new PcmStreamMixer(); - AbstractIndexCache.pcmPlayer1.setStream(TaskHandler.pcmStreamMixer); + AbstractArchive.pcmPlayer1.setStream(TaskHandler.pcmStreamMixer); MilliClock.decimator = new Decimator(22050, class309.PcmPlayer_sampleRate); Login.Login_loadingText = "Prepared sound engine"; Login.Login_loadingPercent = 35; Client.titleLoadingStage = 50; - WorldMapElement.fonts = new Fonts(WorldMapSection3.indexCache8, ByteArrayPool.indexCache13); + WorldMapElement.fonts = new Fonts(WorldMapSection3.archive8, ByteArrayPool.archive13); } else { int var29; if (Client.titleLoadingStage == 50) { @@ -206,7 +206,7 @@ public class class171 { Client.titleLoadingStage = 60; } } else if (Client.titleLoadingStage == 60) { - var0 = FloorDecoration.method2853(class16.indexCache10, WorldMapSection3.indexCache8); + var0 = FloorDecoration.method2853(class16.archive10, WorldMapSection3.archive8); var29 = class3.method36(); if (var0 < var29) { Login.Login_loadingText = "Loading title screen - " + var0 * 100 / var29 + "%"; @@ -218,81 +218,81 @@ public class class171 { Client.titleLoadingStage = 70; } } else { - IndexCache var30; + Archive var30; if (Client.titleLoadingStage == 70) { - if (!ObjectSound.indexCache2.method2()) { - Login.Login_loadingText = "Loading config - " + ObjectSound.indexCache2.loadPercent() + "%"; + if (!ObjectSound.archive2.method2()) { + Login.Login_loadingText = "Loading config - " + ObjectSound.archive2.loadPercent() + "%"; Login.Login_loadingPercent = 60; } else { - Varcs.method2160(ObjectSound.indexCache2); - Varps.method4393(ObjectSound.indexCache2); - IndexCache var31 = ObjectSound.indexCache2; - IndexCache var33 = class40.indexCache7; - KitDefinition.KitDefinition_indexCache = var31; + Varcs.method2160(ObjectSound.archive2); + Varps.method4393(ObjectSound.archive2); + Archive var31 = ObjectSound.archive2; + Archive var33 = class40.archive7; + KitDefinition.KitDefinition_archive = var31; KitDefinition.field456 = var33; - KitDefinition.field457 = KitDefinition.KitDefinition_indexCache.method4(3); - RectangleMode.method6028(ObjectSound.indexCache2, class40.indexCache7, Client.isLowDetail); - IsaacCipher.method4082(ObjectSound.indexCache2, class40.indexCache7); - var30 = ObjectSound.indexCache2; - StructDefinition.field885 = var30; - IndexCache var5 = ObjectSound.indexCache2; - IndexCache var6 = class40.indexCache7; + KitDefinition.field457 = KitDefinition.KitDefinition_archive.method4(3); + RectangleMode.method6028(ObjectSound.archive2, class40.archive7, Client.isLowDetail); + IsaacCipher.method4082(ObjectSound.archive2, class40.archive7); + var30 = ObjectSound.archive2; + StructDefinition.StructDefinition_archive = var30; + Archive var5 = ObjectSound.archive2; + Archive var6 = class40.archive7; boolean var7 = Client.isMembersWorld; Font var8 = ScriptEvent.fontPlain11; - ItemDefinition.ItemDefinition_indexCache = var5; - ItemDefinition.ItemDefinition_modelIndexCache = var6; + ItemDefinition.ItemDefinition_archive = var5; + ItemDefinition.ItemDefinition_modelArchive = var6; class30.inMembersWorld = var7; - class83.field1167 = ItemDefinition.ItemDefinition_indexCache.method4(10); + class83.field1167 = ItemDefinition.ItemDefinition_archive.method4(10); class204.field1122 = var8; - IndexCache var9 = ObjectSound.indexCache2; - IndexCache var10 = AbstractIndexCache.indexCache0; - IndexCache var11 = Skeleton.indexCache1; - SequenceDefinition.SequenceDefinition_indexCache = var9; + Archive var9 = ObjectSound.archive2; + Archive var10 = AbstractArchive.archive0; + Archive var11 = Skeleton.archive1; + SequenceDefinition.SequenceDefinition_archive = var9; SequenceDefinition.field773 = var10; SequenceDefinition.field774 = var11; - IndexCache var12 = ObjectSound.indexCache2; - IndexCache var13 = class40.indexCache7; - SpotAnimationDefinition.SpotAnimationDefinition_indexCache = var12; - SpotAnimationDefinition.SpotAnimationDefinition_modelIndexCache = var13; - UnitPriceComparator.method135(ObjectSound.indexCache2); - IndexCache var14 = ObjectSound.indexCache2; + Archive var12 = ObjectSound.archive2; + Archive var13 = class40.archive7; + SpotAnimationDefinition.SpotAnimationDefinition_archive = var12; + SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var13; + GrandExchangeOfferUnitPriceComparator.setVarbitDefinitionArchive(ObjectSound.archive2); + Archive var14 = ObjectSound.archive2; VarpDefinition.field943 = var14; VarpDefinition.field944 = VarpDefinition.field943.method4(16); - IndexCache var15 = WorldMapIcon1.indexCache3; - IndexCache var16 = class40.indexCache7; - IndexCache var17 = WorldMapSection3.indexCache8; - IndexCache var18 = ByteArrayPool.indexCache13; - Widget.Widget_indexCache = var15; + Archive var15 = WorldMapIcon1.archive3; + Archive var16 = class40.archive7; + Archive var17 = WorldMapSection3.archive8; + Archive var18 = ByteArrayPool.archive13; + Widget.Widget_archive = var15; BufferedSource.field54 = var16; Widget.field955 = var17; class27.field1143 = var18; - Widget.widgets = new Widget[Widget.Widget_indexCache.method5()][]; - Widget.loadedWidgetGroups = new boolean[Widget.Widget_indexCache.method5()]; - IndexCache var19 = ObjectSound.indexCache2; + Widget.interfaceComponents = new Widget[Widget.Widget_archive.method5()][]; + Widget.loadedInterfaces = new boolean[Widget.Widget_archive.method5()]; + Archive var19 = ObjectSound.archive2; class4.field1158 = var19; - IndexCache var20 = ObjectSound.indexCache2; - EnumDefinition.EnumDefinition_indexCache = var20; - Frames.method3241(ObjectSound.indexCache2); - IndexCache var21 = ObjectSound.indexCache2; - ParamKeyDefinition.field679 = var21; + Archive var20 = ObjectSound.archive2; + EnumDefinition.EnumDefinition_archive = var20; + Frames.method3241(ObjectSound.archive2); + Archive var21 = ObjectSound.archive2; + ParamDefinition.ParamDefinition_archive = var21; class196.varcs = new Varcs(); - class60.method1172(ObjectSound.indexCache2, WorldMapSection3.indexCache8, ByteArrayPool.indexCache13); - IndexCache var22 = ObjectSound.indexCache2; - IndexCache var23 = WorldMapSection3.indexCache8; + class60.method1172(ObjectSound.archive2, WorldMapSection3.archive8, ByteArrayPool.archive13); + Archive var22 = ObjectSound.archive2; + Archive var23 = WorldMapSection3.archive8; HealthBarDefinition.field379 = var22; HealthBarDefinition.field380 = var23; - IndexCache var24 = ObjectSound.indexCache2; - IndexCache var25 = WorldMapSection3.indexCache8; - WorldMapElement.field1019 = var25; + Archive var24 = ObjectSound.archive2; + Archive var25 = WorldMapSection3.archive8; + WorldMapElement.WorldMapElement_archive = var25; if (var24.method2()) { UserComparator4.WorldMapElement_count = var24.method4(35); Widget.WorldMapElement_cached = new WorldMapElement[UserComparator4.WorldMapElement_count]; for (int var26 = 0; var26 < UserComparator4.WorldMapElement_count; ++var26) { - byte[] var27 = var24.takeRecord(35, var26); + byte[] var27 = var24.takeFile(35, var26); Widget.WorldMapElement_cached[var26] = new WorldMapElement(var26); if (var27 != null) { - Widget.WorldMapElement_cached[var26].read(new Buffer(var27)); + Widget.WorldMapElement_cached[var26].decode(new Buffer(var27)); Widget.WorldMapElement_cached[var26].method389(); } } @@ -304,14 +304,14 @@ public class class171 { } } else if (Client.titleLoadingStage == 80) { var0 = 0; - if (UnitPriceComparator.compass == null) { - UnitPriceComparator.compass = class322.readSprite(WorldMapSection3.indexCache8, class211.spriteIds.field878, 0); + if (GrandExchangeOfferUnitPriceComparator.compass == null) { + GrandExchangeOfferUnitPriceComparator.compass = class322.readSprite(WorldMapSection3.archive8, class211.spriteIds.field878, 0); } else { ++var0; } if (FaceNormal.field345 == null) { - FaceNormal.field345 = class322.readSprite(WorldMapSection3.indexCache8, class211.spriteIds.field879, 0); + FaceNormal.field345 = class322.readSprite(WorldMapSection3.archive8, class211.spriteIds.field879, 0); } else { ++var0; } @@ -319,7 +319,7 @@ public class class171 { IndexedSprite[] var32; int var34; if (class192.mapSceneSprites == null) { - var30 = WorldMapSection3.indexCache8; + var30 = WorldMapSection3.archive8; var34 = class211.spriteIds.mapScenes; if (!SpriteMask.loadSprite(var30, var34, 0)) { var32 = null; @@ -334,7 +334,7 @@ public class class171 { Sprite[] var35; if (class15.headIconPkSprites == null) { - var30 = WorldMapSection3.indexCache8; + var30 = WorldMapSection3.archive8; var34 = class211.spriteIds.headIconsPk; if (!SpriteMask.loadSprite(var30, var34, 0)) { var35 = null; @@ -348,7 +348,7 @@ public class class171 { } if (ClientPreferences.headIconPrayerSprites == null) { - var30 = WorldMapSection3.indexCache8; + var30 = WorldMapSection3.archive8; var34 = class211.spriteIds.headIconsPrayer; if (!SpriteMask.loadSprite(var30, var34, 0)) { var35 = null; @@ -362,7 +362,7 @@ public class class171 { } if (Player.headIconHintSprites == null) { - var30 = WorldMapSection3.indexCache8; + var30 = WorldMapSection3.archive8; var34 = class211.spriteIds.headIconsHint; if (!SpriteMask.loadSprite(var30, var34, 0)) { var35 = null; @@ -376,7 +376,7 @@ public class class171 { } if (class16.mapMarkerSprites == null) { - var30 = WorldMapSection3.indexCache8; + var30 = WorldMapSection3.archive8; var34 = class211.spriteIds.mapMarkers; if (!SpriteMask.loadSprite(var30, var34, 0)) { var35 = null; @@ -390,7 +390,7 @@ public class class171 { } if (KeyHandler.crossSprites == null) { - var30 = WorldMapSection3.indexCache8; + var30 = WorldMapSection3.archive8; var34 = class211.spriteIds.crosses; if (!SpriteMask.loadSprite(var30, var34, 0)) { var35 = null; @@ -404,7 +404,7 @@ public class class171 { } if (class39.mapDotSprites == null) { - var30 = WorldMapSection3.indexCache8; + var30 = WorldMapSection3.archive8; var34 = class211.spriteIds.mapDots; if (!SpriteMask.loadSprite(var30, var34, 0)) { var35 = null; @@ -418,7 +418,7 @@ public class class171 { } if (class32.scrollBarSprites == null) { - var30 = WorldMapSection3.indexCache8; + var30 = WorldMapSection3.archive8; var34 = class211.spriteIds.scrollBars; if (!SpriteMask.loadSprite(var30, var34, 0)) { var32 = null; @@ -432,7 +432,7 @@ public class class171 { } if (WorldMapSectionType.modIconSprites == null) { - var30 = WorldMapSection3.indexCache8; + var30 = WorldMapSection3.archive8; var34 = class211.spriteIds.modIcons; if (!SpriteMask.loadSprite(var30, var34, 0)) { var32 = null; @@ -461,11 +461,11 @@ public class class171 { Client.titleLoadingStage = 90; } } else if (Client.titleLoadingStage == 90) { - if (!class238.indexCache9.method2()) { + if (!class238.archive9.method2()) { Login.Login_loadingText = "Loading textures - 0%"; Login.Login_loadingPercent = 90; } else { - SecureRandomFuture.textureProvider = new TextureProvider(class238.indexCache9, WorldMapSection3.indexCache8, 20, 0.8D, Client.isLowDetail ? 64 : 128); + SecureRandomFuture.textureProvider = new TextureProvider(class238.archive9, WorldMapSection3.archive8, 20, 0.8D, Client.isLowDetail ? 64 : 128); Rasterizer3D.Rasterizer3D_setTextureLoader(SecureRandomFuture.textureProvider); Rasterizer3D.Rasterizer3D_setBrightness(0.8D); Client.titleLoadingStage = 100; @@ -487,25 +487,25 @@ public class class171 { Login.Login_loadingPercent = 92; Client.titleLoadingStage = 120; } else if (Client.titleLoadingStage == 120) { - if (!class16.indexCache10.tryLoadRecordByNames("huffman", "")) { + if (!class16.archive10.tryLoadFileByNames("huffman", "")) { Login.Login_loadingText = "Loading wordpack - 0%"; Login.Login_loadingPercent = 94; } else { - Huffman var37 = new Huffman(class16.indexCache10.takeRecordByNames("huffman", "")); + Huffman var37 = new Huffman(class16.archive10.takeFileByNames("huffman", "")); class303.huffman = var37; Login.Login_loadingText = "Loaded wordpack"; Login.Login_loadingPercent = 94; Client.titleLoadingStage = 130; } } else if (Client.titleLoadingStage == 130) { - if (!WorldMapIcon1.indexCache3.method2()) { - Login.Login_loadingText = "Loading interfaces - " + WorldMapIcon1.indexCache3.loadPercent() * 4 / 5 + "%"; + if (!WorldMapIcon1.archive3.method2()) { + Login.Login_loadingText = "Loading interfaces - " + WorldMapIcon1.archive3.loadPercent() * 4 / 5 + "%"; Login.Login_loadingPercent = 96; - } else if (!Formatting.indexCache12.method2()) { - Login.Login_loadingText = "Loading interfaces - " + (80 + Formatting.indexCache12.loadPercent() / 6) + "%"; + } else if (!Formatting.archive12.method2()) { + Login.Login_loadingText = "Loading interfaces - " + (80 + Formatting.archive12.loadPercent() / 6) + "%"; Login.Login_loadingPercent = 96; - } else if (!ByteArrayPool.indexCache13.method2()) { - Login.Login_loadingText = "Loading interfaces - " + (96 + ByteArrayPool.indexCache13.loadPercent() / 50) + "%"; + } else if (!ByteArrayPool.archive13.method2()) { + Login.Login_loadingText = "Loading interfaces - " + (96 + ByteArrayPool.archive13.loadPercent() / 50) + "%"; Login.Login_loadingPercent = 96; } else { Login.Login_loadingText = "Loaded interfaces"; @@ -514,8 +514,8 @@ public class class171 { } } else if (Client.titleLoadingStage == 140) { Login.Login_loadingPercent = 100; - if (!ItemContainer.field434.tryLoadArchiveByName(WorldMapCacheName.WorldMapCacheName_details.name)) { - Login.Login_loadingText = "Loading world map - " + ItemContainer.field434.archiveLoadPercentByName(WorldMapCacheName.WorldMapCacheName_details.name) / 10 + "%"; + if (!ItemContainer.field434.tryLoadGroupByName(WorldMapCacheName.WorldMapCacheName_details.name)) { + Login.Login_loadingText = "Loading world map - " + ItemContainer.field434.groupLoadPercentByName(WorldMapCacheName.WorldMapCacheName_details.name) / 10 + "%"; } else { if (class60.worldMap0 == null) { class60.worldMap0 = new WorldMap(); @@ -547,7 +547,7 @@ public class class171 { var6.opIndex = var0; var6.targetName = var4; var6.args0 = var5.onOp; - AbstractIndexCache.runScript(var6); + AbstractArchive.runScript(var6); } boolean var11 = true; diff --git a/runescape-client/src/main/java/class196.java b/runescape-client/src/main/java/class196.java index 64d8241dc3..5931b7aa83 100644 --- a/runescape-client/src/main/java/class196.java +++ b/runescape-client/src/main/java/class196.java @@ -18,7 +18,7 @@ public class class196 { garbageValue = "125" ) static int method3736(int var0, Script var1, boolean var2) { - return var0 < 1000 ? Canvas.method861(var0, var1, var2) : (var0 < 1100 ? class1.method8(var0, var1, var2) : (var0 < 1200 ? StructDefinition.method4952(var0, var1, var2) : (var0 < 1300 ? class32.method576(var0, var1, var2) : (var0 < 1400 ? WorldMapAreaData.method710(var0, var1, var2) : (var0 < 1500 ? class11.method141(var0, var1, var2) : (var0 < 1600 ? WorldMapSectionType.method253(var0, var1, var2) : (var0 < 1700 ? ScriptEvent.method1185(var0, var1, var2) : (var0 < 1800 ? Formatting.method2023(var0, var1, var2) : (var0 < 1900 ? class16.method188(var0, var1, var2) : (var0 < 2000 ? FriendSystem.method1867(var0, var1, var2) : (var0 < 2100 ? class1.method8(var0, var1, var2) : (var0 < 2200 ? StructDefinition.method4952(var0, var1, var2) : (var0 < 2300 ? class32.method576(var0, var1, var2) : (var0 < 2400 ? WorldMapAreaData.method710(var0, var1, var2) : (var0 < 2500 ? class11.method141(var0, var1, var2) : (var0 < 2600 ? ViewportMouse.method2983(var0, var1, var2) : (var0 < 2700 ? GrandExchangeEvents.method75(var0, var1, var2) : (var0 < 2800 ? class11.method146(var0, var1, var2) : (var0 < 2900 ? class15.method182(var0, var1, var2) : (var0 < 3000 ? FriendSystem.method1867(var0, var1, var2) : (var0 < 3200 ? class4.method54(var0, var1, var2) : (var0 < 3300 ? WorldComparator.method68(var0, var1, var2) : (var0 < 3400 ? ScriptEvent.method1187(var0, var1, var2) : (var0 < 3500 ? Formatting.method2022(var0, var1, var2) : (var0 < 3700 ? FontName.method5639(var0, var1, var2) : (var0 < 4000 ? class248.method4741(var0, var1, var2) : (var0 < 4100 ? TextureProvider.method2752(var0, var1, var2) : (var0 < 4200 ? class211.method4103(var0, var1, var2) : (var0 < 4300 ? class1.method16(var0, var1, var2) : (var0 < 5100 ? DynamicObject.method2223(var0, var1, var2) : (var0 < 5400 ? UserComparator4.method3335(var0, var1, var2) : (var0 < 5600 ? OwnWorldComparator.method1285(var0, var1, var2) : (var0 < 5700 ? Decimator.method2492(var0, var1, var2) : (var0 < 6300 ? class229.method4513(var0, var1, var2) : (var0 < 6600 ? class31.method573(var0, var1, var2) : (var0 < 6700 ? class54.method1093(var0, var1, var2) : 2)))))))))))))))))))))))))))))))))))); + return var0 < 1000 ? Canvas.method861(var0, var1, var2) : (var0 < 1100 ? class1.method8(var0, var1, var2) : (var0 < 1200 ? StructDefinition.method4952(var0, var1, var2) : (var0 < 1300 ? class32.method576(var0, var1, var2) : (var0 < 1400 ? WorldMapAreaData.method710(var0, var1, var2) : (var0 < 1500 ? GrandExchangeOfferNameComparator.method141(var0, var1, var2) : (var0 < 1600 ? WorldMapSectionType.method253(var0, var1, var2) : (var0 < 1700 ? ScriptEvent.method1185(var0, var1, var2) : (var0 < 1800 ? Formatting.method2023(var0, var1, var2) : (var0 < 1900 ? class16.method188(var0, var1, var2) : (var0 < 2000 ? FriendSystem.method1867(var0, var1, var2) : (var0 < 2100 ? class1.method8(var0, var1, var2) : (var0 < 2200 ? StructDefinition.method4952(var0, var1, var2) : (var0 < 2300 ? class32.method576(var0, var1, var2) : (var0 < 2400 ? WorldMapAreaData.method710(var0, var1, var2) : (var0 < 2500 ? GrandExchangeOfferNameComparator.method141(var0, var1, var2) : (var0 < 2600 ? ViewportMouse.method2983(var0, var1, var2) : (var0 < 2700 ? GrandExchangeEvents.method75(var0, var1, var2) : (var0 < 2800 ? GrandExchangeOfferNameComparator.method146(var0, var1, var2) : (var0 < 2900 ? class15.method182(var0, var1, var2) : (var0 < 3000 ? FriendSystem.method1867(var0, var1, var2) : (var0 < 3200 ? class4.method54(var0, var1, var2) : (var0 < 3300 ? GrandExchangeOfferWorldComparator.method68(var0, var1, var2) : (var0 < 3400 ? ScriptEvent.method1187(var0, var1, var2) : (var0 < 3500 ? Formatting.method2022(var0, var1, var2) : (var0 < 3700 ? FontName.method5639(var0, var1, var2) : (var0 < 4000 ? class248.method4741(var0, var1, var2) : (var0 < 4100 ? TextureProvider.method2752(var0, var1, var2) : (var0 < 4200 ? class211.method4103(var0, var1, var2) : (var0 < 4300 ? class1.method16(var0, var1, var2) : (var0 < 5100 ? DynamicObject.method2223(var0, var1, var2) : (var0 < 5400 ? UserComparator4.method3335(var0, var1, var2) : (var0 < 5600 ? GrandExchangeOfferOwnWorldComparator.method1285(var0, var1, var2) : (var0 < 5700 ? Decimator.method2492(var0, var1, var2) : (var0 < 6300 ? class229.method4513(var0, var1, var2) : (var0 < 6600 ? class31.method573(var0, var1, var2) : (var0 < 6700 ? class54.method1093(var0, var1, var2) : 2)))))))))))))))))))))))))))))))))))); } @ObfuscatedName("u") diff --git a/runescape-client/src/main/java/class2.java b/runescape-client/src/main/java/class2.java index 2fc08b58ab..988d364e39 100644 --- a/runescape-client/src/main/java/class2.java +++ b/runescape-client/src/main/java/class2.java @@ -9,8 +9,8 @@ final class class2 implements class0 { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache14") - static IndexCache indexCache14; + @Export("archive14") + static Archive archive14; @ObfuscatedName("ee") @ObfuscatedGetter( intValue = -753026759 @@ -56,7 +56,7 @@ final class class2 implements class0 { signature = "(Lir;Lir;ZII)V", garbageValue = "-1535318699" ) - static void method27(AbstractIndexCache var0, AbstractIndexCache var1, boolean var2, int var3) { + static void method27(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { if (Login.field465) { if (var3 == 4) { Login.loginIndex = 4; @@ -64,7 +64,7 @@ final class class2 implements class0 { } else { Login.loginIndex = var3; Rasterizer2D.Rasterizer2D_clear(); - byte[] var4 = var0.takeRecordByNames("title.jpg", ""); + byte[] var4 = var0.takeFileByNames("title.jpg", ""); Login.leftTitleSprite = class27.convertJpgToSprite(var4); Fonts.rightTitleSprite = Login.leftTitleSprite.copy(); if ((Client.worldProperties & 536870912) != 0) { @@ -74,9 +74,9 @@ final class class2 implements class0 { } Login.titleboxSprite = MenuAction.loadIndexedSpriteByName(var1, "titlebox", ""); - IndexCacheLoader.titlebuttonSprite = MenuAction.loadIndexedSpriteByName(var1, "titlebutton", ""); - int var5 = var1.getArchiveId("runes"); - int var6 = var1.getRecordId(var5, ""); + ArchiveLoader.titlebuttonSprite = MenuAction.loadIndexedSpriteByName(var1, "titlebutton", ""); + int var5 = var1.getGroupId("runes"); + int var6 = var1.getFileId(var5, ""); IndexedSprite[] var7; if (!SpriteMask.loadSprite(var1, var5, var6)) { var7 = null; @@ -85,8 +85,8 @@ final class class2 implements class0 { } WorldMapEvent.runesSprite = var7; - var6 = var1.getArchiveId("title_mute"); - int var8 = var1.getRecordId(var6, ""); + var6 = var1.getGroupId("title_mute"); + int var8 = var1.getFileId(var6, ""); IndexedSprite[] var9; if (!SpriteMask.loadSprite(var1, var6, var8)) { var9 = null; @@ -112,7 +112,7 @@ final class class2 implements class0 { Login.field470 = true; Login.worldSelectOpen = false; if (!ReflectionCheck.clientPreferences.titleMusicDisabled) { - Canvas.method858(2, UserComparator3.indexCache6, "scape main", "", 255, false); + Canvas.method858(2, UserComparator3.archive6, "scape main", "", 255, false); } else { AbstractSocket.method3488(2); } @@ -134,9 +134,9 @@ final class class2 implements class0 { signature = "(Lir;Ljava/lang/String;Ljava/lang/String;B)[Lln;", garbageValue = "0" ) - public static Sprite[] method20(AbstractIndexCache var0, String var1, String var2) { - int var3 = var0.getArchiveId(var1); - int var4 = var0.getRecordId(var3, var2); + public static Sprite[] method20(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); + int var4 = var0.getFileId(var3, var2); Sprite[] var5; if (!SpriteMask.loadSprite(var0, var3, var4)) { var5 = null; diff --git a/runescape-client/src/main/java/class204.java b/runescape-client/src/main/java/class204.java index 4f769cbdf6..fe7e8011c0 100644 --- a/runescape-client/src/main/java/class204.java +++ b/runescape-client/src/main/java/class204.java @@ -30,9 +30,9 @@ public class class204 { signature = "(Lir;Ljava/lang/String;Ljava/lang/String;IZB)V", garbageValue = "0" ) - public static void method4011(AbstractIndexCache var0, String var1, String var2, int var3, boolean var4) { - int var5 = var0.getArchiveId(var1); - int var6 = var0.getRecordId(var5, var2); + public static void method4011(AbstractArchive var0, String var1, String var2, int var3, boolean var4) { + int var5 = var0.getGroupId(var1); + int var6 = var0.getFileId(var5, var2); Login.method2076(var0, var5, var6, var3, var4); } @@ -46,8 +46,8 @@ public class class204 { for (int var10 = 0; var10 < 8; ++var10) { for (var9 = 0; var9 < 8; ++var9) { if (var10 + var2 > 0 && var10 + var2 < 103 && var3 + var9 > 0 && var3 + var9 < 103) { - int[] var10000 = var8[var1].flags[var10 + var2]; - var10000[var3 + var9] &= -16777217; + int[] var11 = var8[var1].flags[var10 + var2]; + var11[var3 + var9] &= -16777217; } } } @@ -55,11 +55,11 @@ public class class204 { Buffer var18 = new Buffer(var0); for (var9 = 0; var9 < 4; ++var9) { - for (int var11 = 0; var11 < 64; ++var11) { + for (int var19 = 0; var19 < 64; ++var19) { for (int var12 = 0; var12 < 64; ++var12) { - if (var9 == var4 && var11 >= var5 && var11 < var5 + 8 && var12 >= var6 && var12 < var6 + 8) { - int var13 = var2 + CollisionMap.method3632(var11 & 7, var12 & 7, var7); - int var14 = var11 & 7; + if (var9 == var4 && var19 >= var5 && var19 < var5 + 8 && var12 >= var6 && var12 < var6 + 8) { + int var13 = var2 + CollisionMap.method3632(var19 & 7, var12 & 7, var7); + int var14 = var19 & 7; int var15 = var12 & 7; int var16 = var7 & 3; int var17; @@ -73,9 +73,9 @@ public class class204 { var17 = var14; } - TotalQuantityComparator.loadTerrain(var18, var1, var13, var3 + var17, 0, 0, var7); + GrandExchangeOfferTotalQuantityComparator.loadTerrain(var18, var1, var13, var3 + var17, 0, 0, var7); } else { - TotalQuantityComparator.loadTerrain(var18, 0, -1, -1, 0, 0, 0); + GrandExchangeOfferTotalQuantityComparator.loadTerrain(var18, 0, -1, -1, 0, 0, 0); } } } diff --git a/runescape-client/src/main/java/class206.java b/runescape-client/src/main/java/class206.java index 05ab4835f3..b30272a9cb 100644 --- a/runescape-client/src/main/java/class206.java +++ b/runescape-client/src/main/java/class206.java @@ -1,3 +1,4 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -8,7 +9,8 @@ public class class206 { signature = "(I)Z", garbageValue = "-1763054678" ) - static boolean method4028() { + @Export("getTapToDrop") + static boolean getTapToDrop() { return Client.tapToDrop; } } diff --git a/runescape-client/src/main/java/class21.java b/runescape-client/src/main/java/class21.java index 94984cac3c..6fa1f51396 100644 --- a/runescape-client/src/main/java/class21.java +++ b/runescape-client/src/main/java/class21.java @@ -94,9 +94,9 @@ public abstract class class21 { signature = "(Lir;B)V", garbageValue = "-108" ) - void method263(AbstractIndexCache var1) { + void method263(AbstractArchive var1) { if (!this.method271()) { - byte[] var2 = var1.takeRecord(this.field150, this.field152); + byte[] var2 = var1.takeFile(this.field150, this.field152); if (var2 != null) { this.vmethod715(new Buffer(var2)); this.field157 = true; @@ -112,11 +112,11 @@ public abstract class class21 { garbageValue = "-2111523326" ) void method282() { - this.field151 = (short[][][])null; - this.field145 = (short[][][])null; - this.field154 = (byte[][][])null; - this.field155 = (byte[][][])null; - this.field144 = (WorldMapDecoration[][][][])null; + this.field151 = (short[][][])((short[][][])null); + this.field145 = (short[][][])((short[][][])null); + this.field154 = ((byte[][][])null); + this.field155 = ((byte[][][])null); + this.field144 = (WorldMapDecoration[][][][])((WorldMapDecoration[][][][])null); this.field157 = false; this.field153 = false; } @@ -327,9 +327,9 @@ public abstract class class21 { var3.overheadText = var0.readStringCp1252NullTerminated(); if (var3.overheadText.charAt(0) == '~') { var3.overheadText = var3.overheadText.substring(1); - WorldMapIcon1.method219(2, var3.username.getName(), var3.overheadText); + WorldMapIcon1.addGameMessage(2, var3.username.getName(), var3.overheadText); } else if (var3 == Canvas.localPlayer) { - WorldMapIcon1.method219(2, var3.username.getName(), var3.overheadText); + WorldMapIcon1.addGameMessage(2, var3.username.getName(), var3.overheadText); } var3.isAutoChatting = false; @@ -396,9 +396,9 @@ public abstract class class21 { } if (var17.modIcon != -1) { - WorldMapIcon1.method219(var10, ItemContainer.method1170(var17.modIcon) + var3.username.getName(), var14); + WorldMapIcon1.addGameMessage(var10, ItemContainer.method1170(var17.modIcon) + var3.username.getName(), var14); } else { - WorldMapIcon1.method219(var10, var3.username.getName(), var14); + WorldMapIcon1.addGameMessage(var10, var3.username.getName(), var14); } } } @@ -419,7 +419,7 @@ public abstract class class21 { } var7 = var0.readUnsignedByte(); - class234.method4534(var3, var6, var7); + class234.performPlayerAnimation(var3, var6, var7); } if (var3.field725) { diff --git a/runescape-client/src/main/java/class211.java b/runescape-client/src/main/java/class211.java index dec93d8492..b017a4cdb1 100644 --- a/runescape-client/src/main/java/class211.java +++ b/runescape-client/src/main/java/class211.java @@ -4,6 +4,7 @@ import java.util.TimeZone; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("hg") public class class211 { @@ -18,7 +19,7 @@ public class class211 { signature = "Llg;" ) @Export("spriteIds") - static SpriteIds spriteIds; + static GraphicsDefaults spriteIds; @ObfuscatedName("m") @ObfuscatedSignature( @@ -37,32 +38,32 @@ public class class211 { static int method4103(int var0, Script var1, boolean var2) { String var3; int var4; - if (var0 == 4100) { + if (var0 == ScriptOpcodes.APPEND_NUM) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + var4; return 1; } else { String var5; - if (var0 == 4101) { + if (var0 == ScriptOpcodes.APPEND) { Interpreter.Interpreter_stringStackSize -= 2; var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; var5 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + var5; return 1; - } else if (var0 == 4102) { + } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + ByteArrayPool.method4001(var4, true); return 1; - } else if (var0 == 4103) { + } else if (var0 == ScriptOpcodes.LOWERCASE) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.toLowerCase(); return 1; } else { int var6; int var7; - if (var0 == 4104) { + if (var0 == ScriptOpcodes.FROMDATE) { var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; long var14 = ((long)var7 + 11745L) * 86400000L; Interpreter.Interpreter_calendar.setTime(new Date(var14)); @@ -71,12 +72,12 @@ public class class211 { int var16 = Interpreter.Interpreter_calendar.get(1); Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.field422[var15] + "-" + var16; return 1; - } else if (var0 != 4105) { - if (var0 == 4106) { + } else if (var0 != ScriptOpcodes.TEXT_GENDER) { + if (var0 == ScriptOpcodes.TOSTRING) { var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Integer.toString(var7); return 1; - } else if (var0 == 4107) { + } else if (var0 == ScriptOpcodes.COMPARE) { Interpreter.Interpreter_stringStackSize -= 2; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WallDecoration.method3256(AttackOption.method2033(Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1], Client.language)); return 1; @@ -84,25 +85,25 @@ public class class211 { int var8; byte[] var9; Font var10; - if (var0 == 4108) { + if (var0 == ScriptOpcodes.PARAHEIGHT) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; RouteStrategy.Interpreter_intStackSize -= 2; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var8 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; - var9 = ByteArrayPool.indexCache13.takeRecord(var8, 0); + var9 = ByteArrayPool.archive13.takeFile(var8, 0); var10 = new Font(var9); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var10.lineCount(var3, var4); return 1; - } else if (var0 == 4109) { + } else if (var0 == ScriptOpcodes.PARAWIDTH) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; RouteStrategy.Interpreter_intStackSize -= 2; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var8 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; - var9 = ByteArrayPool.indexCache13.takeRecord(var8, 0); + var9 = ByteArrayPool.archive13.takeFile(var8, 0); var10 = new Font(var9); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var10.lineWidth(var3, var4); return 1; - } else if (var0 == 4110) { + } else if (var0 == ScriptOpcodes.TEXT_SWITCH) { Interpreter.Interpreter_stringStackSize -= 2; var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; var5 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; @@ -113,32 +114,32 @@ public class class211 { } return 1; - } else if (var0 == 4111) { + } else if (var0 == ScriptOpcodes.ESCAPE) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); return 1; - } else if (var0 == 4112) { + } else if (var0 == ScriptOpcodes.APPEND_CHAR) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + (char)var4; return 1; - } else if (var0 == 4113) { + } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ChatChannel.method2238((char)var7) ? 1 : 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ChatChannel.isCharPrintable((char)var7) ? 1 : 0; return 1; - } else if (var0 == 4114) { + } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = VarcInt.isAlphaNumeric((char)var7) ? 1 : 0; return 1; - } else if (var0 == 4115) { + } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = UrlRequest.method3271((char)var7) ? 1 : 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = UrlRequest.isCharAlphabetic((char)var7) ? 1 : 0; return 1; - } else if (var0 == 4116) { + } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class159.method3394((char)var7) ? 1 : 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class159.isCharDigit((char)var7) ? 1 : 0; return 1; - } else if (var0 == 4117) { + } else if (var0 == ScriptOpcodes.STRING_LENGTH) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; if (var3 != null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.length(); @@ -147,14 +148,14 @@ public class class211 { } return 1; - } else if (var0 == 4118) { + } else if (var0 == ScriptOpcodes.SUBSTRING) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; RouteStrategy.Interpreter_intStackSize -= 2; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var8 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.substring(var4, var8); return 1; - } else if (var0 == 4119) { + } else if (var0 == ScriptOpcodes.REMOVETAGS) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; StringBuilder var11 = new StringBuilder(var3.length()); boolean var12 = false; @@ -172,19 +173,19 @@ public class class211 { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.toString(); return 1; - } else if (var0 == 4120) { + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.indexOf(var4); return 1; - } else if (var0 == 4121) { + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { Interpreter.Interpreter_stringStackSize -= 2; var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; var5 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.indexOf(var5, var8); return 1; - } else if (var0 == 4122) { + } else if (var0 == ScriptOpcodes.UPPERCASE) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.toUpperCase(); return 1; diff --git a/runescape-client/src/main/java/class214.java b/runescape-client/src/main/java/class214.java index e57819a221..39911f035c 100644 --- a/runescape-client/src/main/java/class214.java +++ b/runescape-client/src/main/java/class214.java @@ -9,12 +9,12 @@ public class class214 { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field1127; + public static AbstractArchive field1127; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field1128; + public static AbstractArchive field1128; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Lhm;" @@ -30,7 +30,7 @@ public class class214 { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field1130; + public static AbstractArchive field1130; @ObfuscatedName("k") static int[] field1131; @ObfuscatedName("ko") diff --git a/runescape-client/src/main/java/class22.java b/runescape-client/src/main/java/class22.java index ca51d2e204..59bb98f81f 100644 --- a/runescape-client/src/main/java/class22.java +++ b/runescape-client/src/main/java/class22.java @@ -21,8 +21,8 @@ public final class class22 { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache16") - static IndexCache indexCache16; + @Export("archive16") + static Archive archive16; @ObfuscatedName("m") @ObfuscatedGetter( intValue = 1976624405 @@ -73,7 +73,7 @@ public final class class22 { StringBuilder var1 = (new StringBuilder()).append(var0); Object var2 = null; String var3 = var1.append(" is already on your ignore list").toString(); - WorldMapIcon1.method219(30, "", var3); + WorldMapIcon1.addGameMessage(30, "", var3); } @ObfuscatedName("fw") @@ -81,14 +81,14 @@ public final class class22 { signature = "(IZZZB)Lit;", garbageValue = "-15" ) - @Export("newIndexCache") - static IndexCache newIndexCache(int var0, boolean var1, boolean var2, boolean var3) { - IndexStore var4 = null; + @Export("newArchive") + static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) { + ArchiveDisk var4 = null; if (class168.dat2File != null) { - var4 = new IndexStore(var0, class168.dat2File, IndexStoreAction.idxFiles[var0], 1000000); + var4 = new ArchiveDisk(var0, class168.dat2File, ArchiveDiskAction.idxFiles[var0], 1000000); } - return new IndexCache(var4, Fonts.indexStore255, var0, var1, var2, var3); + return new Archive(var4, Fonts.masterDisk, var0, var1, var2, var3); } @ObfuscatedName("jp") @@ -112,7 +112,7 @@ public final class class22 { SpriteMask var4 = var0.getSpriteMask(false); if (var4 != null) { if (Client.minimapState < 3) { - UnitPriceComparator.compass.method315(var1, var2, var4.width, var4.height, 25, 25, Client.minimapOrientation, 256, var4.xStarts, var4.xWidths); + GrandExchangeOfferUnitPriceComparator.compass.method315(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths); } else { Rasterizer2D.method5948(var1, var2, 0, var4.xStarts, var4.xWidths); } diff --git a/runescape-client/src/main/java/class226.java b/runescape-client/src/main/java/class226.java index 099dbf1a87..717fe2281a 100644 --- a/runescape-client/src/main/java/class226.java +++ b/runescape-client/src/main/java/class226.java @@ -19,14 +19,14 @@ public class class226 { garbageValue = "-76173898" ) @Export("getItemSprite") - public static final Sprite getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) { - if (var1 == -1) { + public static final Sprite getItemSprite(int var0, int quantity, int var2, int var3, int var4, boolean var5) { + if (quantity == -1) { var4 = 0; - } else if (var4 == 2 && var1 != 1) { + } else if (var4 == 2 && quantity != 1) { var4 = 1; } - long var6 = ((long)var1 << 16) + (long)var0 + ((long)var2 << 38) + ((long)var4 << 40) + ((long)var3 << 42); + long var6 = ((long)quantity << 16) + (long)var0 + ((long)var2 << 38) + ((long)var4 << 40) + ((long)var3 << 42); Sprite var8; if (!var5) { var8 = (Sprite)ItemDefinition.Sprite_cached.get(var6); @@ -36,12 +36,12 @@ public class class226 { } ItemDefinition var9 = Skills.getItemDefinition(var0); - if (var1 > 1 && var9.field436 != null) { + if (quantity > 1 && var9.countobj != null) { int var10 = -1; for (int var11 = 0; var11 < 10; ++var11) { - if (var1 >= var9.field437[var11] && var9.field437[var11] != 0) { - var10 = var9.field436[var11]; + if (quantity >= var9.countco[var11] && var9.countco[var11] != 0) { + var10 = var9.countobj[var11]; } } @@ -61,12 +61,12 @@ public class class226 { return null; } } else if (var9.notedId != -1) { - var20 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); + var20 = getItemSprite(var9.unnotedId, quantity, var2, var3, 0, false); if (var20 == null) { return null; } } else if (var9.placeholderTemplate != -1) { - var20 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); + var20 = getItemSprite(var9.placeholder, quantity, 0, 0, 0, false); if (var20 == null) { return null; } @@ -120,7 +120,7 @@ public class class226 { } if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { - class204.field1122.draw(class196.method3735(var1), 0, 9, 16776960, 1); + class204.field1122.draw(class196.method3735(quantity), 0, 9, 16776960, 1); } if (!var5) { diff --git a/runescape-client/src/main/java/class227.java b/runescape-client/src/main/java/class227.java index f0251349b1..b42c492b72 100644 --- a/runescape-client/src/main/java/class227.java +++ b/runescape-client/src/main/java/class227.java @@ -90,16 +90,16 @@ public class class227 { } } - Object var31; + Object var32; if (var5 == 22) { if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { if (var8.animationId == -1 && var8.transforms == null) { - var31 = var8.method232(22, var4, var15, var17, var16, var18); + var32 = var8.method232(22, var4, var15, var17, var16, var18); } else { - var31 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + var32 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, true, (Entity)null); } - var6.newFloorDecoration(var0, var1, var2, var16, (Entity)var31, var19, var21); + var6.newFloorDecoration(var0, var1, var2, var16, (Entity)var32, var19, var21); if (var8.interactType == 1 && var7 != null) { var7.method93(var1, var2); } @@ -107,18 +107,18 @@ public class class227 { } else { int var25; if (var5 != 10 && var5 != 11) { - int[] var10000; + int[] var26; if (var5 >= 12) { if (var8.animationId == -1 && var8.transforms == null) { - var31 = var8.method232(var5, var4, var15, var17, var16, var18); + var32 = var8.method232(var5, var4, var15, var17, var16, var18); } else { - var31 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + var32 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null); } - var6.method284(var0, var1, var2, var16, 1, 1, (Entity)var31, 0, var19, var21); + var6.method284(var0, var1, var2, var16, 1, 1, (Entity)var32, 0, var19, var21); if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { - var10000 = Tiles.field910[var0][var1]; - var10000[var2] |= 2340; + var26 = Tiles.field910[var0][var1]; + var26[var2] |= 2340; } if (var8.interactType != 0 && var7 != null) { @@ -126,12 +126,12 @@ public class class227 { } } else if (var5 == 0) { if (var8.animationId == -1 && var8.transforms == null) { - var31 = var8.method232(0, var4, var15, var17, var16, var18); + var32 = var8.method232(0, var4, var15, var17, var16, var18); } else { - var31 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + var32 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, true, (Entity)null); } - var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var31, (Entity)null, Tiles.field911[var4], 0, var19, var21); + var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var32, (Entity)null, Tiles.field911[var4], 0, var19, var21); if (var4 == 0) { if (var8.clipped) { Tiles.field909[var0][var1][var2] = 50; @@ -139,8 +139,8 @@ public class class227 { } if (var8.modelClipped) { - var10000 = Tiles.field910[var0][var1]; - var10000[var2] |= 585; + var26 = Tiles.field910[var0][var1]; + var26[var2] |= 585; } } else if (var4 == 1) { if (var8.clipped) { @@ -149,8 +149,8 @@ public class class227 { } if (var8.modelClipped) { - var10000 = Tiles.field910[var0][var1]; - var10000[1 + var2] |= 1170; + var26 = Tiles.field910[var0][var1]; + var26[1 + var2] |= 1170; } } else if (var4 == 2) { if (var8.clipped) { @@ -159,8 +159,8 @@ public class class227 { } if (var8.modelClipped) { - var10000 = Tiles.field910[var0][var1 + 1]; - var10000[var2] |= 585; + var26 = Tiles.field910[var0][var1 + 1]; + var26[var2] |= 585; } } else if (var4 == 3) { if (var8.clipped) { @@ -169,8 +169,8 @@ public class class227 { } if (var8.modelClipped) { - var10000 = Tiles.field910[var0][var1]; - var10000[var2] |= 1170; + var26 = Tiles.field910[var0][var1]; + var26[var2] |= 1170; } } @@ -183,12 +183,12 @@ public class class227 { } } else if (var5 == 1) { if (var8.animationId == -1 && var8.transforms == null) { - var31 = var8.method232(1, var4, var15, var17, var16, var18); + var32 = var8.method232(1, var4, var15, var17, var16, var18); } else { - var31 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + var32 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, true, (Entity)null); } - var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var31, (Entity)null, Tiles.field912[var4], 0, var19, var21); + var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var32, (Entity)null, Tiles.field912[var4], 0, var19, var21); if (var8.clipped) { if (var4 == 0) { Tiles.field909[var0][var1][var2 + 1] = 50; @@ -204,167 +204,168 @@ public class class227 { if (var8.interactType != 0 && var7 != null) { var7.method90(var1, var2, var5, var4, var8.boolean1); } - } else if (var5 == 2) { - var25 = var4 + 1 & 3; - Object var26; - Object var27; - if (var8.animationId == -1 && var8.transforms == null) { - var26 = var8.method232(2, var4 + 4, var15, var17, var16, var18); - var27 = var8.method232(2, var25, var15, var17, var16, var18); - } else { - var26 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); - var27 = new DynamicObject(var3, 2, var25, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var26, (Entity)var27, Tiles.field911[var4], Tiles.field911[var25], var19, var21); - if (var8.modelClipped) { - if (var4 == 0) { - var10000 = Tiles.field910[var0][var1]; - var10000[var2] |= 585; - var10000 = Tiles.field910[var0][var1]; - var10000[1 + var2] |= 1170; - } else if (var4 == 1) { - var10000 = Tiles.field910[var0][var1]; - var10000[1 + var2] |= 1170; - var10000 = Tiles.field910[var0][var1 + 1]; - var10000[var2] |= 585; - } else if (var4 == 2) { - var10000 = Tiles.field910[var0][var1 + 1]; - var10000[var2] |= 585; - var10000 = Tiles.field910[var0][var1]; - var10000[var2] |= 1170; - } else if (var4 == 3) { - var10000 = Tiles.field910[var0][var1]; - var10000[var2] |= 1170; - var10000 = Tiles.field910[var0][var1]; - var10000[var2] |= 585; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method90(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method287(var0, var1, var2, var8.int2); - } - } else if (var5 == 3) { - if (var8.animationId == -1 && var8.transforms == null) { - var31 = var8.method232(3, var4, var15, var17, var16, var18); - } else { - var31 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var31, (Entity)null, Tiles.field912[var4], 0, var19, var21); - if (var8.clipped) { - if (var4 == 0) { - Tiles.field909[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { - Tiles.field909[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { - Tiles.field909[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { - Tiles.field909[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method90(var1, var2, var5, var4, var8.boolean1); - } - } else if (var5 == 9) { - if (var8.animationId == -1 && var8.transforms == null) { - var31 = var8.method232(var5, var4, var15, var17, var16, var18); - } else { - var31 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.method284(var0, var1, var2, var16, 1, 1, (Entity)var31, 0, var19, var21); - if (var8.interactType != 0 && var7 != null) { - var7.method91(var1, var2, var9, var10, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method287(var0, var1, var2, var8.int2); - } - } else if (var5 == 4) { - if (var8.animationId == -1 && var8.transforms == null) { - var31 = var8.method232(4, var4, var15, var17, var16, var18); - } else { - var31 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Entity)var31, (Entity)null, Tiles.field911[var4], 0, 0, 0, var19, var21); } else { - Object var28; - long var32; - if (var5 == 5) { - var25 = 16; - var32 = var6.method290(var0, var1, var2); - if (var32 != 0L) { - var25 = class50.getObjectDefinition(HitSplatDefinition.method4972(var32)).int2; - } - + Object var27; + if (var5 == 2) { + var25 = var4 + 1 & 3; + Object var28; if (var8.animationId == -1 && var8.transforms == null) { - var28 = var8.method232(4, var4, var15, var17, var16, var18); + var27 = var8.method232(2, var4 + 4, var15, var17, var16, var18); + var28 = var8.method232(2, var25, var15, var17, var16, var18); } else { - var28 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + var27 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); + var28 = new DynamicObject(var3, 2, var25, var0, var1, var2, var8.animationId, true, (Entity)null); } - var6.newWallDecoration(var0, var1, var2, var16, (Entity)var28, (Entity)null, Tiles.field911[var4], 0, var25 * Tiles.field913[var4], var25 * Tiles.field914[var4], var19, var21); - } else if (var5 == 6) { - var25 = 8; - var32 = var6.method290(var0, var1, var2); - if (var32 != 0L) { - var25 = class50.getObjectDefinition(HitSplatDefinition.method4972(var32)).int2 / 2; + var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var27, (Entity)var28, Tiles.field911[var4], Tiles.field911[var25], var19, var21); + if (var8.modelClipped) { + if (var4 == 0) { + var26 = Tiles.field910[var0][var1]; + var26[var2] |= 585; + var26 = Tiles.field910[var0][var1]; + var26[1 + var2] |= 1170; + } else if (var4 == 1) { + var26 = Tiles.field910[var0][var1]; + var26[1 + var2] |= 1170; + var26 = Tiles.field910[var0][var1 + 1]; + var26[var2] |= 585; + } else if (var4 == 2) { + var26 = Tiles.field910[var0][var1 + 1]; + var26[var2] |= 585; + var26 = Tiles.field910[var0][var1]; + var26[var2] |= 1170; + } else if (var4 == 3) { + var26 = Tiles.field910[var0][var1]; + var26[var2] |= 1170; + var26 = Tiles.field910[var0][var1]; + var26[var2] |= 585; + } } + if (var8.interactType != 0 && var7 != null) { + var7.method90(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { + var6.method287(var0, var1, var2, var8.int2); + } + } else if (var5 == 3) { if (var8.animationId == -1 && var8.transforms == null) { - var28 = var8.method232(4, var4 + 4, var15, var17, var16, var18); + var32 = var8.method232(3, var4, var15, var17, var16, var18); } else { - var28 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); + var32 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, true, (Entity)null); } - var6.newWallDecoration(var0, var1, var2, var16, (Entity)var28, (Entity)null, 256, var4, var25 * Tiles.field915[var4], var25 * Tiles.field916[var4], var19, var21); - } else if (var5 == 7) { - var22 = var4 + 2 & 3; + var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var32, (Entity)null, Tiles.field912[var4], 0, var19, var21); + if (var8.clipped) { + if (var4 == 0) { + Tiles.field909[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { + Tiles.field909[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { + Tiles.field909[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { + Tiles.field909[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method90(var1, var2, var5, var4, var8.boolean1); + } + } else if (var5 == 9) { if (var8.animationId == -1 && var8.transforms == null) { - var31 = var8.method232(4, var22 + 4, var15, var17, var16, var18); + var32 = var8.method232(var5, var4, var15, var17, var16, var18); } else { - var31 = new DynamicObject(var3, 4, var22 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); + var32 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null); } - var6.newWallDecoration(var0, var1, var2, var16, (Entity)var31, (Entity)null, 256, var22, 0, 0, var19, var21); - } else if (var5 == 8) { - var25 = 8; - var32 = var6.method290(var0, var1, var2); - if (var32 != 0L) { - var25 = class50.getObjectDefinition(HitSplatDefinition.method4972(var32)).int2 / 2; + var6.method284(var0, var1, var2, var16, 1, 1, (Entity)var32, 0, var19, var21); + if (var8.interactType != 0 && var7 != null) { + var7.method91(var1, var2, var9, var10, var8.boolean1); } - int var29 = var4 + 2 & 3; - Object var30; + if (var8.int2 != 16) { + var6.method287(var0, var1, var2, var8.int2); + } + } else if (var5 == 4) { if (var8.animationId == -1 && var8.transforms == null) { - var28 = var8.method232(4, var4 + 4, var15, var17, var16, var18); - var30 = var8.method232(4, var29 + 4, var15, var17, var16, var18); + var32 = var8.method232(4, var4, var15, var17, var16, var18); } else { - var28 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); - var30 = new DynamicObject(var3, 4, var29 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); + var32 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null); } - var6.newWallDecoration(var0, var1, var2, var16, (Entity)var28, (Entity)var30, 256, var4, var25 * Tiles.field915[var4], var25 * Tiles.field916[var4], var19, var21); + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var32, (Entity)null, Tiles.field911[var4], 0, 0, 0, var19, var21); + } else { + long var33; + if (var5 == 5) { + var25 = 16; + var33 = var6.getBoundaryObjectTag(var0, var1, var2); + if (var33 != 0L) { + var25 = class50.getObjectDefinition(HitSplatDefinition.method4972(var33)).int2; + } + + if (var8.animationId == -1 && var8.transforms == null) { + var27 = var8.method232(4, var4, var15, var17, var16, var18); + } else { + var27 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var27, (Entity)null, Tiles.field911[var4], 0, var25 * Tiles.field913[var4], var25 * Tiles.field914[var4], var19, var21); + } else if (var5 == 6) { + var25 = 8; + var33 = var6.getBoundaryObjectTag(var0, var1, var2); + if (var33 != 0L) { + var25 = class50.getObjectDefinition(HitSplatDefinition.method4972(var33)).int2 / 2; + } + + if (var8.animationId == -1 && var8.transforms == null) { + var27 = var8.method232(4, var4 + 4, var15, var17, var16, var18); + } else { + var27 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var27, (Entity)null, 256, var4, var25 * Tiles.field915[var4], var25 * Tiles.field916[var4], var19, var21); + } else if (var5 == 7) { + var22 = var4 + 2 & 3; + if (var8.animationId == -1 && var8.transforms == null) { + var32 = var8.method232(4, var22 + 4, var15, var17, var16, var18); + } else { + var32 = new DynamicObject(var3, 4, var22 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var32, (Entity)null, 256, var22, 0, 0, var19, var21); + } else if (var5 == 8) { + var25 = 8; + var33 = var6.getBoundaryObjectTag(var0, var1, var2); + if (var33 != 0L) { + var25 = class50.getObjectDefinition(HitSplatDefinition.method4972(var33)).int2 / 2; + } + + int var30 = var4 + 2 & 3; + Object var31; + if (var8.animationId == -1 && var8.transforms == null) { + var27 = var8.method232(4, var4 + 4, var15, var17, var16, var18); + var31 = var8.method232(4, var30 + 4, var15, var17, var16, var18); + } else { + var27 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); + var31 = new DynamicObject(var3, 4, var30 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var27, (Entity)var31, 256, var4, var25 * Tiles.field915[var4], var25 * Tiles.field916[var4], var19, var21); + } } } } else { if (var8.animationId == -1 && var8.transforms == null) { - var31 = var8.method232(10, var4, var15, var17, var16, var18); + var32 = var8.method232(10, var4, var15, var17, var16, var18); } else { - var31 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + var32 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, true, (Entity)null); } - if (var31 != null && var6.method284(var0, var1, var2, var16, var9, var10, (Entity)var31, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { + if (var32 != null && var6.method284(var0, var1, var2, var16, var9, var10, (Entity)var32, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { var22 = 15; - if (var31 instanceof Model) { - var22 = ((Model)var31).method198() / 4; + if (var32 instanceof Model) { + var22 = ((Model)var32).method198() / 4; if (var22 > 30) { var22 = 30; } diff --git a/runescape-client/src/main/java/class229.java b/runescape-client/src/main/java/class229.java index 6162f555a4..45b2567226 100644 --- a/runescape-client/src/main/java/class229.java +++ b/runescape-client/src/main/java/class229.java @@ -1,6 +1,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("hz") public class class229 { @@ -12,20 +13,20 @@ public class class229 { signature = "(IB)Ljb;", garbageValue = "-41" ) - @Export("getParamKeyDefinition") - public static ParamKeyDefinition getParamKeyDefinition(int var0) { - ParamKeyDefinition var1 = (ParamKeyDefinition)ParamKeyDefinition.ParamKeyDefinition_cached.get((long)var0); + @Export("getParamDefinition") + public static ParamDefinition getParamDefinition(int var0) { + ParamDefinition var1 = (ParamDefinition)ParamDefinition.ParamDefinition_cached.get((long)var0); if (var1 != null) { return var1; } else { - byte[] var2 = ParamKeyDefinition.field679.takeRecord(11, var0); - var1 = new ParamKeyDefinition(); + byte[] var2 = ParamDefinition.ParamDefinition_archive.takeFile(11, var0); + var1 = new ParamDefinition(); if (var2 != null) { - var1.read(new Buffer(var2)); + var1.decode(new Buffer(var2)); } - var1.init(); - ParamKeyDefinition.ParamKeyDefinition_cached.put(var1, (long)var0); + var1.postDecode(); + ParamDefinition.ParamDefinition_cached.put(var1, (long)var0); return var1; } } @@ -36,7 +37,7 @@ public class class229 { garbageValue = "1886084106" ) static int method4513(int var0, Script var1, boolean var2) { - if (var0 == 6200) { + if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { RouteStrategy.Interpreter_intStackSize -= 2; Client.field130 = (short)class161.method3395(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]); if (Client.field130 <= 0) { @@ -49,7 +50,7 @@ public class class229 { } return 1; - } else if (var0 == 6201) { + } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { RouteStrategy.Interpreter_intStackSize -= 2; Client.field150 = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; if (Client.field150 <= 0) { @@ -62,7 +63,7 @@ public class class229 { } return 1; - } else if (var0 == 6202) { + } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { RouteStrategy.Interpreter_intStackSize -= 4; Client.field135 = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; if (Client.field135 <= 0) { @@ -89,7 +90,7 @@ public class class229 { } return 1; - } else if (var0 == 6203) { + } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { if (Client.viewportWidget != null) { FontName.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.viewportWidth; @@ -100,11 +101,11 @@ public class class229 { } return 1; - } else if (var0 == 6204) { + } else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.field150; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.field149; return 1; - } else if (var0 == 6205) { + } else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class30.method571(Client.field130); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class30.method571(Client.field131); return 1; diff --git a/runescape-client/src/main/java/class234.java b/runescape-client/src/main/java/class234.java index 2a129de9d2..d065094361 100644 --- a/runescape-client/src/main/java/class234.java +++ b/runescape-client/src/main/java/class234.java @@ -1,3 +1,4 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -8,7 +9,8 @@ public class class234 { signature = "(Lbr;III)V", garbageValue = "-701527010" ) - static void method4534(Player var0, int var1, int var2) { + @Export("performPlayerAnimation") + static void performPlayerAnimation(Player var0, int var1, int var2) { if (var0.sequence == var1 && var1 != -1) { int var3 = WorldMapAreaData.getSequenceDefinition(var1).field783; if (var3 == 1) { diff --git a/runescape-client/src/main/java/class238.java b/runescape-client/src/main/java/class238.java index 6fa87ea0aa..93abb6d2d3 100644 --- a/runescape-client/src/main/java/class238.java +++ b/runescape-client/src/main/java/class238.java @@ -8,8 +8,8 @@ public final class class238 { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache9") - static IndexCache indexCache9; + @Export("archive9") + static Archive archive9; @ObfuscatedName("im") @ObfuscatedSignature( @@ -17,22 +17,22 @@ public final class class238 { garbageValue = "188151075" ) @Export("runCs1") - static final boolean runCs1(Widget var0) { - if (var0.cs1Comparisons == null) { + static final boolean runCs1(Widget component) { + if (component.cs1Comparisons == null) { return false; } else { - for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { - int var2 = class16.method187(var0, var1); - int var3 = var0.cs1ComparisonValues[var1]; - if (var0.cs1Comparisons[var1] == 2) { + for (int var1 = 0; var1 < component.cs1Comparisons.length; ++var1) { + int var2 = class16.method187(component, var1); + int var3 = component.cs1ComparisonValues[var1]; + if (component.cs1Comparisons[var1] == 2) { if (var2 >= var3) { return false; } - } else if (var0.cs1Comparisons[var1] == 3) { + } else if (component.cs1Comparisons[var1] == 3) { if (var2 <= var3) { return false; } - } else if (var0.cs1Comparisons[var1] == 4) { + } else if (component.cs1Comparisons[var1] == 4) { if (var2 == var3) { return false; } @@ -50,11 +50,11 @@ public final class class238 { signature = "([Lho;IIIIIIII)V", garbageValue = "1706481742" ) - @Export("updateWidgetGroup") - static final void updateWidgetGroup(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - for (int var8 = 0; var8 < var0.length; ++var8) { - Widget var9 = var0[var8]; - if (var9 != null && var9.parentId == var1 && (!var9.isIf3 || var9.type == 0 || var9.hasListener || class1.getWidgetClickMask(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { + @Export("updateInterface") + static final void updateInterface(Widget[] components, int parentId, int var2, int var3, int var4, int var5, int x, int y) { + for (int var8 = 0; var8 < components.length; ++var8) { + Widget var9 = components[var8]; + if (var9 != null && var9.parentId == parentId && (!var9.isIf3 || var9.type == 0 || var9.hasListener || class1.getWidgetClickMask(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { if (var9.isIf3) { if (PacketBufferNode.method3673(var9)) { continue; @@ -63,8 +63,8 @@ public final class class238 { continue; } - int var10 = var9.x + var6; - int var11 = var7 + var9.y; + int var10 = var9.x + x; + int var11 = y + var9.y; int var12; int var13; int var14; @@ -194,10 +194,11 @@ public final class class238 { boolean var20; int var21; + boolean var23; if (var28) { for (int var22 = 0; var22 < var9.field966.length; ++var22) { var20 = false; - boolean var23 = false; + var23 = false; if (!var20 && var9.field966[var22] != null) { for (var21 = 0; var21 < var9.field966[var22].length; ++var21) { boolean var24 = false; @@ -260,7 +261,7 @@ public final class class238 { } } - ScriptEvent var32; + ScriptEvent var31; if (var9.isIf3) { if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { var30 = true; @@ -268,9 +269,9 @@ public final class class238 { var30 = false; } - boolean var31 = false; + var23 = false; if ((MouseHandler.MouseHandler_currentButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var30) { - var31 = true; + var23 = true; } var20 = false; @@ -283,7 +284,7 @@ public final class class238 { } if (var9.contentType == 1400) { - class60.worldMap0.method361(var16, var17, var30 & var31, var30 & var20); + class60.worldMap0.method361(var16, var17, var30 & var23, var30 & var20); } if (Client.clickedWidget != null && var9 != Client.clickedWidget && var30 && class54.method1090(class1.getWidgetClickMask(var9))) { @@ -298,133 +299,133 @@ public final class class238 { if (var9.hasListener) { if (var30 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { - var32 = new ScriptEvent(); - var32.boolean1 = true; - var32.widget = var9; - var32.mouseY = Client.mouseWheelRotation; - var32.args0 = var9.onScroll; - Client.scriptEvents.addFirst(var32); + var31 = new ScriptEvent(); + var31.boolean1 = true; + var31.widget = var9; + var31.mouseY = Client.mouseWheelRotation; + var31.args0 = var9.onScroll; + Client.scriptEvents.addFirst(var31); } if (Client.clickedWidget != null || DevicePcmPlayerProvider.dragInventoryWidget != null || Client.isMenuOpen) { var20 = false; - var31 = false; + var23 = false; var30 = false; } if (!var9.field979 && var20) { var9.field979 = true; if (var9.onClick != null) { - var32 = new ScriptEvent(); - var32.boolean1 = true; - var32.widget = var9; - var32.mouseX = MouseHandler.MouseHandler_lastPressedX - var10; - var32.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; - var32.args0 = var9.onClick; - Client.scriptEvents.addFirst(var32); + var31 = new ScriptEvent(); + var31.boolean1 = true; + var31.widget = var9; + var31.mouseX = MouseHandler.MouseHandler_lastPressedX - var10; + var31.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; + var31.args0 = var9.onClick; + Client.scriptEvents.addFirst(var31); } } - if (var9.field979 && var31 && var9.onClickRepeat != null) { - var32 = new ScriptEvent(); - var32.boolean1 = true; - var32.widget = var9; - var32.mouseX = MouseHandler.MouseHandler_x - var10; - var32.mouseY = MouseHandler.MouseHandler_y - var11; - var32.args0 = var9.onClickRepeat; - Client.scriptEvents.addFirst(var32); + if (var9.field979 && var23 && var9.onClickRepeat != null) { + var31 = new ScriptEvent(); + var31.boolean1 = true; + var31.widget = var9; + var31.mouseX = MouseHandler.MouseHandler_x - var10; + var31.mouseY = MouseHandler.MouseHandler_y - var11; + var31.args0 = var9.onClickRepeat; + Client.scriptEvents.addFirst(var31); } - if (var9.field979 && !var31) { + if (var9.field979 && !var23) { var9.field979 = false; if (var9.onRelease != null) { - var32 = new ScriptEvent(); - var32.boolean1 = true; - var32.widget = var9; - var32.mouseX = MouseHandler.MouseHandler_x - var10; - var32.mouseY = MouseHandler.MouseHandler_y - var11; - var32.args0 = var9.onRelease; - Client.field148.addFirst(var32); + var31 = new ScriptEvent(); + var31.boolean1 = true; + var31.widget = var9; + var31.mouseX = MouseHandler.MouseHandler_x - var10; + var31.mouseY = MouseHandler.MouseHandler_y - var11; + var31.args0 = var9.onRelease; + Client.field148.addFirst(var31); } } - if (var31 && var9.onHold != null) { - var32 = new ScriptEvent(); - var32.boolean1 = true; - var32.widget = var9; - var32.mouseX = MouseHandler.MouseHandler_x - var10; - var32.mouseY = MouseHandler.MouseHandler_y - var11; - var32.args0 = var9.onHold; - Client.scriptEvents.addFirst(var32); + if (var23 && var9.onHold != null) { + var31 = new ScriptEvent(); + var31.boolean1 = true; + var31.widget = var9; + var31.mouseX = MouseHandler.MouseHandler_x - var10; + var31.mouseY = MouseHandler.MouseHandler_y - var11; + var31.args0 = var9.onHold; + Client.scriptEvents.addFirst(var31); } if (!var9.field978 && var30) { var9.field978 = true; if (var9.onMouseOver != null) { - var32 = new ScriptEvent(); - var32.boolean1 = true; - var32.widget = var9; - var32.mouseX = MouseHandler.MouseHandler_x - var10; - var32.mouseY = MouseHandler.MouseHandler_y - var11; - var32.args0 = var9.onMouseOver; - Client.scriptEvents.addFirst(var32); + var31 = new ScriptEvent(); + var31.boolean1 = true; + var31.widget = var9; + var31.mouseX = MouseHandler.MouseHandler_x - var10; + var31.mouseY = MouseHandler.MouseHandler_y - var11; + var31.args0 = var9.onMouseOver; + Client.scriptEvents.addFirst(var31); } } if (var9.field978 && var30 && var9.onMouseRepeat != null) { - var32 = new ScriptEvent(); - var32.boolean1 = true; - var32.widget = var9; - var32.mouseX = MouseHandler.MouseHandler_x - var10; - var32.mouseY = MouseHandler.MouseHandler_y - var11; - var32.args0 = var9.onMouseRepeat; - Client.scriptEvents.addFirst(var32); + var31 = new ScriptEvent(); + var31.boolean1 = true; + var31.widget = var9; + var31.mouseX = MouseHandler.MouseHandler_x - var10; + var31.mouseY = MouseHandler.MouseHandler_y - var11; + var31.args0 = var9.onMouseRepeat; + Client.scriptEvents.addFirst(var31); } if (var9.field978 && !var30) { var9.field978 = false; if (var9.onMouseLeave != null) { - var32 = new ScriptEvent(); - var32.boolean1 = true; - var32.widget = var9; - var32.mouseX = MouseHandler.MouseHandler_x - var10; - var32.mouseY = MouseHandler.MouseHandler_y - var11; - var32.args0 = var9.onMouseLeave; - Client.field148.addFirst(var32); + var31 = new ScriptEvent(); + var31.boolean1 = true; + var31.widget = var9; + var31.mouseX = MouseHandler.MouseHandler_x - var10; + var31.mouseY = MouseHandler.MouseHandler_y - var11; + var31.args0 = var9.onMouseLeave; + Client.field148.addFirst(var31); } } if (var9.onTimer != null) { - var32 = new ScriptEvent(); - var32.widget = var9; - var32.args0 = var9.onTimer; - Client.field147.addFirst(var32); + var31 = new ScriptEvent(); + var31.widget = var9; + var31.args0 = var9.onTimer; + Client.field147.addFirst(var31); } int var26; - ScriptEvent var34; - int var35; + int var32; + ScriptEvent var33; if (var9.onVarTransmit != null && Client.field123 > var9.field981) { if (var9.varTransmitTriggers != null && Client.field123 - var9.field981 <= 32) { label590: - for (var35 = var9.field981; var35 < Client.field123; ++var35) { - var21 = Client.field121[var35 & 31]; + for (var26 = var9.field981; var26 < Client.field123; ++var26) { + var21 = Client.field121[var26 & 31]; - for (var26 = 0; var26 < var9.varTransmitTriggers.length; ++var26) { - if (var21 == var9.varTransmitTriggers[var26]) { - var34 = new ScriptEvent(); - var34.widget = var9; - var34.args0 = var9.onVarTransmit; - Client.scriptEvents.addFirst(var34); + for (var32 = 0; var32 < var9.varTransmitTriggers.length; ++var32) { + if (var21 == var9.varTransmitTriggers[var32]) { + var33 = new ScriptEvent(); + var33.widget = var9; + var33.args0 = var9.onVarTransmit; + Client.scriptEvents.addFirst(var33); break label590; } } } } else { - var32 = new ScriptEvent(); - var32.widget = var9; - var32.args0 = var9.onVarTransmit; - Client.scriptEvents.addFirst(var32); + var31 = new ScriptEvent(); + var31.widget = var9; + var31.args0 = var9.onVarTransmit; + Client.scriptEvents.addFirst(var31); } var9.field981 = Client.field123; @@ -433,24 +434,24 @@ public final class class238 { if (var9.onInvTransmit != null && Client.field117 > var9.field982) { if (var9.invTransmitTriggers != null && Client.field117 - var9.field982 <= 32) { label566: - for (var35 = var9.field982; var35 < Client.field117; ++var35) { - var21 = Client.field116[var35 & 31]; + for (var26 = var9.field982; var26 < Client.field117; ++var26) { + var21 = Client.field116[var26 & 31]; - for (var26 = 0; var26 < var9.invTransmitTriggers.length; ++var26) { - if (var21 == var9.invTransmitTriggers[var26]) { - var34 = new ScriptEvent(); - var34.widget = var9; - var34.args0 = var9.onInvTransmit; - Client.scriptEvents.addFirst(var34); + for (var32 = 0; var32 < var9.invTransmitTriggers.length; ++var32) { + if (var21 == var9.invTransmitTriggers[var32]) { + var33 = new ScriptEvent(); + var33.widget = var9; + var33.args0 = var9.onInvTransmit; + Client.scriptEvents.addFirst(var33); break label566; } } } } else { - var32 = new ScriptEvent(); - var32.widget = var9; - var32.args0 = var9.onInvTransmit; - Client.scriptEvents.addFirst(var32); + var31 = new ScriptEvent(); + var31.widget = var9; + var31.args0 = var9.onInvTransmit; + Client.scriptEvents.addFirst(var31); } var9.field982 = Client.field117; @@ -459,79 +460,79 @@ public final class class238 { if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field983) { if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field983 <= 32) { label542: - for (var35 = var9.field983; var35 < Client.changedSkillsCount; ++var35) { - var21 = Client.changedSkills[var35 & 31]; + for (var26 = var9.field983; var26 < Client.changedSkillsCount; ++var26) { + var21 = Client.changedSkills[var26 & 31]; - for (var26 = 0; var26 < var9.statTransmitTriggers.length; ++var26) { - if (var21 == var9.statTransmitTriggers[var26]) { - var34 = new ScriptEvent(); - var34.widget = var9; - var34.args0 = var9.onStatTransmit; - Client.scriptEvents.addFirst(var34); + for (var32 = 0; var32 < var9.statTransmitTriggers.length; ++var32) { + if (var21 == var9.statTransmitTriggers[var32]) { + var33 = new ScriptEvent(); + var33.widget = var9; + var33.args0 = var9.onStatTransmit; + Client.scriptEvents.addFirst(var33); break label542; } } } } else { - var32 = new ScriptEvent(); - var32.widget = var9; - var32.args0 = var9.onStatTransmit; - Client.scriptEvents.addFirst(var32); + var31 = new ScriptEvent(); + var31.widget = var9; + var31.args0 = var9.onStatTransmit; + Client.scriptEvents.addFirst(var31); } var9.field983 = Client.changedSkillsCount; } - if (Client.chatCycle > var9.field980 && var9.field970 != null) { - var32 = new ScriptEvent(); - var32.widget = var9; - var32.args0 = var9.field970; - Client.scriptEvents.addFirst(var32); + if (Client.chatCycle > var9.field980 && var9.onChatTransmit != null) { + var31 = new ScriptEvent(); + var31.widget = var9; + var31.args0 = var9.onChatTransmit; + Client.scriptEvents.addFirst(var31); } - if (Client.field105 > var9.field980 && var9.field971 != null) { - var32 = new ScriptEvent(); - var32.widget = var9; - var32.args0 = var9.field971; - Client.scriptEvents.addFirst(var32); + if (Client.field105 > var9.field980 && var9.onFriendTransmit != null) { + var31 = new ScriptEvent(); + var31.widget = var9; + var31.args0 = var9.onFriendTransmit; + Client.scriptEvents.addFirst(var31); } - if (Client.field129 > var9.field980 && var9.field972 != null) { - var32 = new ScriptEvent(); - var32.widget = var9; - var32.args0 = var9.field972; - Client.scriptEvents.addFirst(var32); + if (Client.field129 > var9.field980 && var9.onClanTransmit != null) { + var31 = new ScriptEvent(); + var31.widget = var9; + var31.args0 = var9.onClanTransmit; + Client.scriptEvents.addFirst(var31); } - if (Client.field122 > var9.field980 && var9.field976 != null) { - var32 = new ScriptEvent(); - var32.widget = var9; - var32.args0 = var9.field976; - Client.scriptEvents.addFirst(var32); + if (Client.field122 > var9.field980 && var9.onStockTransmit != null) { + var31 = new ScriptEvent(); + var31.widget = var9; + var31.args0 = var9.onStockTransmit; + Client.scriptEvents.addFirst(var31); } if (Client.field154 > var9.field980 && var9.field977 != null) { - var32 = new ScriptEvent(); - var32.widget = var9; - var32.args0 = var9.field977; - Client.scriptEvents.addFirst(var32); + var31 = new ScriptEvent(); + var31.widget = var9; + var31.args0 = var9.field977; + Client.scriptEvents.addFirst(var31); } - if (Client.field124 > var9.field980 && var9.field973 != null) { - var32 = new ScriptEvent(); - var32.widget = var9; - var32.args0 = var9.field973; - Client.scriptEvents.addFirst(var32); + if (Client.field124 > var9.field980 && var9.onMiscTransmit != null) { + var31 = new ScriptEvent(); + var31.widget = var9; + var31.args0 = var9.onMiscTransmit; + Client.scriptEvents.addFirst(var31); } var9.field980 = Client.cycleCntr; - if (var9.onKeyListener != null) { - for (var35 = 0; var35 < Client.field137; ++var35) { + if (var9.onKey != null) { + for (var26 = 0; var26 < Client.field137; ++var26) { ScriptEvent var27 = new ScriptEvent(); var27.widget = var9; - var27.keyTyped = Client.field145[var35]; - var27.keyPressed = Client.field146[var35]; - var27.args0 = var9.onKeyListener; + var27.keyTyped = Client.field145[var26]; + var27.keyPressed = Client.field146[var26]; + var27.args0 = var9.onKey; Client.scriptEvents.addFirst(var27); } } @@ -545,7 +546,7 @@ public final class class238 { if ((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { if (var9.mouseOverRedirect >= 0) { - Clock.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; + Clock.mousedOverWidgetIf1 = components[var9.mouseOverRedirect]; } else { Clock.mousedOverWidgetIf1 = var9; } @@ -561,18 +562,18 @@ public final class class238 { } if (var9.type == 0) { - updateWidgetGroup(var0, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); + updateInterface(components, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); if (var9.children != null) { - updateWidgetGroup(var9.children, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); + updateInterface(var9.children, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); } - WidgetGroupParent var33 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var9.id); - if (var33 != null) { - if (var33.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { - for (var32 = (ScriptEvent)Client.scriptEvents.last(); var32 != null; var32 = (ScriptEvent)Client.scriptEvents.previous()) { - if (var32.boolean1) { - var32.remove(); - var32.widget.field978 = false; + InterfaceParent var34 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); + if (var34 != null) { + if (var34.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { + for (var31 = (ScriptEvent)Client.scriptEvents.last(); var31 != null; var31 = (ScriptEvent)Client.scriptEvents.previous()) { + if (var31.boolean1) { + var31.remove(); + var31.widget.field978 = false; } } @@ -586,7 +587,7 @@ public final class class238 { } } - WorldMapDecorationType.method4517(var33.group, var12, var13, var14, var15, var10, var11); + WorldMapDecorationType.method4517(var34.group, var12, var13, var14, var15, var10, var11); } } } diff --git a/runescape-client/src/main/java/class248.java b/runescape-client/src/main/java/class248.java index b3ada630e4..83ad2b9478 100644 --- a/runescape-client/src/main/java/class248.java +++ b/runescape-client/src/main/java/class248.java @@ -2,6 +2,7 @@ import java.util.HashMap; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("iu") public class class248 { @@ -191,113 +192,113 @@ public class class248 { ) static int method4741(int var0, Script var1, boolean var2) { int var3; - if (var0 == 3903) { + if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); return 1; - } else if (var0 == 3904) { + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; return 1; - } else if (var0 == 3905) { + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; return 1; - } else if (var0 == 3906) { + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; return 1; - } else if (var0 == 3907) { + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; return 1; - } else if (var0 == 3908) { + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; return 1; } else { int var4; - if (var0 == 3910) { + if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var4 = Client.grandExchangeOffers[var3].status(); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4 == 0 ? 1 : 0; return 1; - } else if (var0 == 3911) { + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var4 = Client.grandExchangeOffers[var3].status(); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4 == 2 ? 1 : 0; return 1; - } else if (var0 == 3912) { + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var4 = Client.grandExchangeOffers[var3].status(); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4 == 5 ? 1 : 0; return 1; - } else if (var0 == 3913) { + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var4 = Client.grandExchangeOffers[var3].status(); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4 == 1 ? 1 : 0; return 1; } else { boolean var5; - if (var0 == 3914) { + if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; if (FloorDecoration.grandExchangeEvents != null) { - FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.field373, var5); + FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.geItemNameComparator, var5); } return 1; - } else if (var0 == 3915) { + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; if (FloorDecoration.grandExchangeEvents != null) { - FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.field372, var5); + FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.geUnitPriceComparator, var5); } return 1; - } else if (var0 == 3916) { + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { RouteStrategy.Interpreter_intStackSize -= 2; var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] == 1; boolean var13 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1; if (FloorDecoration.grandExchangeEvents != null) { - Client.field159.field666 = var13; - FloorDecoration.grandExchangeEvents.sort(Client.field159, var5); + Client.geOwnWorldComparator.compareOwnWorld = var13; + FloorDecoration.grandExchangeEvents.sort(Client.geOwnWorldComparator, var5); } return 1; - } else if (var0 == 3917) { + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; if (FloorDecoration.grandExchangeEvents != null) { - FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.field371, var5); + FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.geAgeComparator, var5); } return 1; - } else if (var0 == 3918) { + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; if (FloorDecoration.grandExchangeEvents != null) { - FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.field374, var5); + FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.geTotalQuantityComparator, var5); } return 1; - } else if (var0 == 3919) { + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = FloorDecoration.grandExchangeEvents == null ? 0 : FloorDecoration.grandExchangeEvents.events.size(); return 1; } else { GrandExchangeEvent var6; - if (var0 == 3920) { + if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.world; return 1; - } else if (var0 == 3921) { + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.method119(); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.getOfferName(); return 1; - } else if (var0 == 3922) { + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.method120(); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.getPreviousOfferName(); return 1; - } else if (var0 == 3923) { + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3); long var7 = class203.currentTimeMs() - class15.field1113 - var6.field370; @@ -307,17 +308,17 @@ public class class248 { String var12 = var9 + ":" + var10 / 10 + var10 % 10 + ":" + var11 / 10 + var11 % 10; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var12; return 1; - } else if (var0 == 3924) { + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.grandExchangeOffer.totalQuantity; return 1; - } else if (var0 == 3925) { + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.grandExchangeOffer.unitPrice; return 1; - } else if (var0 == 3926) { + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.grandExchangeOffer.id; diff --git a/runescape-client/src/main/java/class249.java b/runescape-client/src/main/java/class249.java index 5693e89cd6..dc09ff3081 100644 --- a/runescape-client/src/main/java/class249.java +++ b/runescape-client/src/main/java/class249.java @@ -30,11 +30,12 @@ public enum class249 implements Enumerated { @ObfuscatedGetter( intValue = 1686539261 ) - final int field3276; + @Export("id") + final int id; private class249(int var3, int var4) { this.field3275 = var3; - this.field3276 = var4; + this.id = var4; } @ObfuscatedName("f") @@ -44,6 +45,6 @@ public enum class249 implements Enumerated { ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field3276; + return this.id; } } diff --git a/runescape-client/src/main/java/class258.java b/runescape-client/src/main/java/class258.java index 9d5e68b68a..c020bc70dd 100644 --- a/runescape-client/src/main/java/class258.java +++ b/runescape-client/src/main/java/class258.java @@ -29,7 +29,7 @@ public class class258 { VarbitDefinition.indexedSpriteWidths = null; SecureRandomCallable.indexedSpriteHeights = null; class328.indexedSpritePalette = null; - class328.spritePixels = (byte[][])null; + class328.spritePixels = ((byte[][])null); return var0; } @@ -42,7 +42,7 @@ public class class258 { PendingSpawn var9 = null; for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) { - if (var0 == var10.level && var10.x == var1 && var2 == var10.y && var3 == var10.type) { + if (var0 == var10.plane && var10.x == var1 && var2 == var10.y && var3 == var10.type) { var9 = var10; break; } @@ -50,7 +50,7 @@ public class class258 { if (var9 == null) { var9 = new PendingSpawn(); - var9.level = var0; + var9.plane = var0; var9.type = var3; var9.x = var1; var9.y = var2; diff --git a/runescape-client/src/main/java/class266.java b/runescape-client/src/main/java/class266.java index 530e82e647..275ac90a19 100644 --- a/runescape-client/src/main/java/class266.java +++ b/runescape-client/src/main/java/class266.java @@ -33,11 +33,12 @@ public enum class266 implements Enumerated { @ObfuscatedGetter( intValue = -1327532101 ) - final int field3530; + @Export("id") + final int id; private class266(int var3, int var4) { this.field3528 = var3; - this.field3530 = var4; + this.id = var4; } @ObfuscatedName("f") @@ -47,7 +48,7 @@ public enum class266 implements Enumerated { ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field3530; + return this.id; } @ObfuscatedName("ft") diff --git a/runescape-client/src/main/java/class27.java b/runescape-client/src/main/java/class27.java index 1bc9f8323c..f9786265b1 100644 --- a/runescape-client/src/main/java/class27.java +++ b/runescape-client/src/main/java/class27.java @@ -13,7 +13,7 @@ public final class class27 { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field1143; + public static AbstractArchive field1143; @ObfuscatedName("f") final int[] field225; diff --git a/runescape-client/src/main/java/class3.java b/runescape-client/src/main/java/class3.java index 85d54a219a..98d7e65ec0 100644 --- a/runescape-client/src/main/java/class3.java +++ b/runescape-client/src/main/java/class3.java @@ -97,17 +97,17 @@ public class class3 implements Enumerated { ) public static void method41() { while (true) { - NodeDeque var0 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue; - IndexStoreAction var1; - synchronized(IndexStoreActionHandler.IndexStoreActionHandler_requestQueue) { - var1 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_responseQueue.removeLast(); + NodeDeque var0 = ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue; + ArchiveDiskAction var1; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + var1 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); } if (var1 == null) { return; } - var1.indexCache.load(var1.indexStore, (int)var1.key, var1.data, false); + var1.archive.load(var1.archiveDisk, (int)var1.key, var1.data, false); } } @@ -116,29 +116,30 @@ public class class3 implements Enumerated { signature = "(IIIZIZI)V", garbageValue = "653716649" ) - static void method42(int var0, int var1, int var2, boolean var3, int var4, boolean var5) { - if (var0 < var1) { - int var6 = (var0 + var1) / 2; - int var7 = var0; + @Export("doWorldSorting") + static void doWorldSorting(int lowestUnsorted, int highestUnsorted, int primaryMode, boolean primaryReversed, int secondaryMode, boolean secondaryReversed) { + if (lowestUnsorted < highestUnsorted) { + int var6 = (lowestUnsorted + highestUnsorted) / 2; + int var7 = lowestUnsorted; World var8 = ItemContainer.worlds[var6]; - ItemContainer.worlds[var6] = ItemContainer.worlds[var1]; - ItemContainer.worlds[var1] = var8; + ItemContainer.worlds[var6] = ItemContainer.worlds[highestUnsorted]; + ItemContainer.worlds[highestUnsorted] = var8; - for (int var9 = var0; var9 < var1; ++var9) { + for (int var9 = lowestUnsorted; var9 < highestUnsorted; ++var9) { World var10 = ItemContainer.worlds[var9]; - int var11 = WorldMapLabel.compareWorlds(var10, var8, var2, var3); + int var11 = WorldMapLabel.compareWorlds(var10, var8, primaryMode, primaryReversed); int var12; if (var11 != 0) { - if (var3) { + if (primaryReversed) { var12 = -var11; } else { var12 = var11; } - } else if (var4 == -1) { + } else if (secondaryMode == -1) { var12 = 0; } else { - int var13 = WorldMapLabel.compareWorlds(var10, var8, var4, var5); - if (var5) { + int var13 = WorldMapLabel.compareWorlds(var10, var8, secondaryMode, secondaryReversed); + if (secondaryReversed) { var12 = -var13; } else { var12 = var13; @@ -152,10 +153,10 @@ public class class3 implements Enumerated { } } - ItemContainer.worlds[var1] = ItemContainer.worlds[var7]; + ItemContainer.worlds[highestUnsorted] = ItemContainer.worlds[var7]; ItemContainer.worlds[var7] = var8; - method42(var0, var7 - 1, var2, var3, var4, var5); - method42(var7 + 1, var1, var2, var3, var4, var5); + doWorldSorting(lowestUnsorted, var7 - 1, primaryMode, primaryReversed, secondaryMode, secondaryReversed); + doWorldSorting(var7 + 1, highestUnsorted, primaryMode, primaryReversed, secondaryMode, secondaryReversed); } } @@ -289,17 +290,17 @@ public class class3 implements Enumerated { } var15.walkSequence = var15.definition.walkSequence; - var15.walkTurnSequence = var15.definition.walkTurnSequence; - var15.walkTurnLeftSequence = var15.definition.walkTurnLeftSequence; - var15.walkTurnRightSequence = var15.definition.walkTurnRightSequence; - var15.idleSequence = var15.definition.idleSequence; + var15.walkBackSequence = var15.definition.walkBackSequence; + var15.walkLeftSequence = var15.definition.walkLeftSequence; + var15.walkRightSequence = var15.definition.walkRightSequence; + var15.readySequence = var15.definition.readySequence; var15.turnLeftSequence = var15.definition.turnLeftSequence; var15.turnRightSequence = var15.definition.turnRightSequence; var15.method228(Canvas.localPlayer.pathX[0] + var5, Canvas.localPlayer.pathY[0] + var8, var12 == 1); } var1.exportIndex(); - WorldComparator.method67(var1); + GrandExchangeOfferWorldComparator.method67(var1); for (var13 = 0; var13 < Client.field211; ++var13) { var3 = Client.field212[var13]; diff --git a/runescape-client/src/main/java/class30.java b/runescape-client/src/main/java/class30.java index 0fe6164fd8..aceac67d05 100644 --- a/runescape-client/src/main/java/class30.java +++ b/runescape-client/src/main/java/class30.java @@ -24,8 +24,8 @@ public class class30 { @ObfuscatedGetter( intValue = -18917723 ) - @Export("musicTrackArchiveId") - public static int musicTrackArchiveId; + @Export("musicTrackGroupId") + public static int musicTrackGroupId; @ObfuscatedName("l") @Export("inMembersWorld") public static boolean inMembersWorld; @@ -84,21 +84,21 @@ public class class30 { method570(var3.children, var1); } - WidgetGroupParent var4 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var3.id); + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); if (var4 != null) { GrandExchangeEvents.method74(var4.group, var1); } } ScriptEvent var6; - if (var1 == 0 && var3.onDialogAbortListener != null) { + if (var1 == 0 && var3.onDialogAbort != null) { var6 = new ScriptEvent(); var6.widget = var3; - var6.args0 = var3.onDialogAbortListener; - AbstractIndexCache.runScript(var6); + var6.args0 = var3.onDialogAbort; + AbstractArchive.runScript(var6); } - if (var1 == 1 && var3.field974 != null) { + if (var1 == 1 && var3.onSubChange != null) { if (var3.childIndex >= 0) { Widget var5 = Huffman.getWidget(var3.id); if (var5 == null || var5.children == null || var3.childIndex >= var5.children.length || var3 != var5.children[var3.childIndex]) { @@ -108,8 +108,8 @@ public class class30 { var6 = new ScriptEvent(); var6.widget = var3; - var6.args0 = var3.field974; - AbstractIndexCache.runScript(var6); + var6.args0 = var3.onSubChange; + AbstractArchive.runScript(var6); } } } diff --git a/runescape-client/src/main/java/class31.java b/runescape-client/src/main/java/class31.java index e985580e29..ad52fd4fdb 100644 --- a/runescape-client/src/main/java/class31.java +++ b/runescape-client/src/main/java/class31.java @@ -2,6 +2,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("ac") public class class31 { @@ -55,12 +56,12 @@ public class class31 { garbageValue = "130306081" ) static int method573(int var0, Script var1, boolean var2) { - if (var0 == 6500) { + if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ClientParameter.loadWorlds() ? 1 : 0; return 1; } else { World var3; - if (var0 == 6501) { + if (var0 == ScriptOpcodes.WORLDLIST_START) { var3 = class190.method3672(); if (var3 != null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.id; @@ -79,7 +80,7 @@ public class class31 { } return 1; - } else if (var0 == 6502) { + } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { var3 = Fonts.method5647(); if (var3 != null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.id; @@ -102,7 +103,7 @@ public class class31 { World var4; int var5; int var6; - if (var0 == 6506) { + if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { var6 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var4 = null; @@ -130,73 +131,73 @@ public class class31 { } return 1; - } else if (var0 == 6507) { + } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { RouteStrategy.Interpreter_intStackSize -= 4; var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; boolean var9 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1; var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; boolean var10 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3] == 1; - WorldMapSectionType.method248(var6, var9, var5, var10); + WorldMapSectionType.sortWorlds(var6, var9, var5, var10); return 1; - } else if (var0 != 6511) { - if (var0 == 6512) { + } else if (var0 != ScriptOpcodes.GETWORLDINFO) { + if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; } else { int var7; - ParamKeyDefinition var8; - if (var0 == 6513) { + ParamDefinition var8; + if (var0 == ScriptOpcodes.NC_PARAM) { RouteStrategy.Interpreter_intStackSize -= 2; var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; - var8 = class229.getParamKeyDefinition(var7); + var8 = class229.getParamDefinition(var7); if (var8.isString()) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ObjectDefinition.getNpcDefinition(var6).getStringParam(var7, var8.keyString); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ObjectDefinition.getNpcDefinition(var6).getStringParam(var7, var8.defaultStr); } else { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ObjectDefinition.getNpcDefinition(var6).getIntParam(var7, var8.keyInt); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ObjectDefinition.getNpcDefinition(var6).getIntParam(var7, var8.defaultInt); } return 1; - } else if (var0 == 6514) { + } else if (var0 == ScriptOpcodes.LC_PARAM) { RouteStrategy.Interpreter_intStackSize -= 2; var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; - var8 = class229.getParamKeyDefinition(var7); + var8 = class229.getParamDefinition(var7); if (var8.isString()) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class50.getObjectDefinition(var6).getStringParam(var7, var8.keyString); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class50.getObjectDefinition(var6).getStringParam(var7, var8.defaultStr); } else { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class50.getObjectDefinition(var6).getIntParam(var7, var8.keyInt); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class50.getObjectDefinition(var6).getIntParam(var7, var8.defaultInt); } return 1; - } else if (var0 == 6515) { + } else if (var0 == ScriptOpcodes.OC_PARAM) { RouteStrategy.Interpreter_intStackSize -= 2; var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; - var8 = class229.getParamKeyDefinition(var7); + var8 = class229.getParamDefinition(var7); if (var8.isString()) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Skills.getItemDefinition(var6).getStringParam(var7, var8.keyString); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Skills.getItemDefinition(var6).getStringParam(var7, var8.defaultStr); } else { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var6).getIntParam(var7, var8.keyInt); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var6).getIntParam(var7, var8.defaultInt); } return 1; - } else if (var0 == 6516) { + } else if (var0 == ScriptOpcodes.STRUCT_PARAM) { RouteStrategy.Interpreter_intStackSize -= 2; var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; - var8 = class229.getParamKeyDefinition(var7); + var8 = class229.getParamDefinition(var7); if (var8.isString()) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = GzipDecompressor.method3702(var6).getStringParam(var7, var8.keyString); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = GzipDecompressor.getStructDefinition(var6).getStringParam(var7, var8.defaultStr); } else { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = GzipDecompressor.method3702(var6).getIntParam(var7, var8.keyInt); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = GzipDecompressor.getStructDefinition(var6).getIntParam(var7, var8.defaultInt); } return 1; - } else if (var0 == 6518) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.field162 ? 1 : 0; + } else if (var0 == ScriptOpcodes.ON_MOBILE) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; return 1; - } else if (var0 == 6519) { + } else if (var0 == ScriptOpcodes.CLIENTTYPE) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.clientType & 3; return 1; } else if (var0 == 6520) { @@ -211,13 +212,13 @@ public class class31 { --Interpreter.Interpreter_stringStackSize; --RouteStrategy.Interpreter_intStackSize; return 1; - } else if (var0 == 6524) { + } else if (var0 == ScriptOpcodes.BATTERYLEVEL) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; return 1; - } else if (var0 == 6525) { + } else if (var0 == ScriptOpcodes.BATTERYCHARGING) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1; return 1; - } else if (var0 == 6526) { + } else if (var0 == ScriptOpcodes.WIFIAVAILABLE) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1; return 1; } else { @@ -257,7 +258,7 @@ public class class31 { static final void method574(String var0) { if (!var0.equals("")) { PacketBufferNode var1 = Interpreter.method1915(ClientPacket.field300, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(WorldMapRegion.method550(var0)); + var1.packetBuffer.writeByte(WorldMapRegion.stringCp1252NullTerminatedByteSize(var0)); var1.packetBuffer.writeStringCp1252NullTerminated(var0); Client.packetWriter.method241(var1); } diff --git a/runescape-client/src/main/java/class32.java b/runescape-client/src/main/java/class32.java index d77052c7ea..5bce438bb1 100644 --- a/runescape-client/src/main/java/class32.java +++ b/runescape-client/src/main/java/class32.java @@ -1,6 +1,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("ay") public class class32 { @@ -24,16 +25,16 @@ public class class32 { var0 -= 1000; var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); } else { - var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111; + var3 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111; } class22.method295(var3); - if (var0 != 1200 && var0 != 1205 && var0 != 1212) { - if (var0 == 1201) { + if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) { + if (var0 == ScriptOpcodes.CC_SETNPCHEAD) { var3.modelType = 2; var3.modelId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; return 1; - } else if (var0 == 1202) { + } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { var3.modelType = 3; var3.modelId = Canvas.localPlayer.appearance.getChatHeadId(); return 1; @@ -53,9 +54,9 @@ public class class32 { var3.modelOffsetX = var6.offsetX2d; var3.modelOffsetY = var6.offsetY2d; var3.modelZoom = var6.zoom2d; - if (var0 == 1205) { + if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) { var3.itemQuantityMode = 0; - } else if (var0 == 1212 | 1 == var6.isStackable) { + } else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | 1 == var6.isStackable) { var3.itemQuantityMode = 1; } else { var3.itemQuantityMode = 2; diff --git a/runescape-client/src/main/java/class322.java b/runescape-client/src/main/java/class322.java index cd12bd2e00..279019cb09 100644 --- a/runescape-client/src/main/java/class322.java +++ b/runescape-client/src/main/java/class322.java @@ -17,8 +17,8 @@ public class class322 { garbageValue = "-2000477161" ) @Export("readSprite") - public static Sprite readSprite(AbstractIndexCache var0, int var1, int var2) { - return !SpriteMask.loadSprite(var0, var1, var2) ? null : class258.method4900(); + public static Sprite readSprite(AbstractArchive archive, int group, int file) { + return !SpriteMask.loadSprite(archive, group, file) ? null : class258.method4900(); } static { diff --git a/runescape-client/src/main/java/class39.java b/runescape-client/src/main/java/class39.java index e66798f49a..36ca69390f 100644 --- a/runescape-client/src/main/java/class39.java +++ b/runescape-client/src/main/java/class39.java @@ -145,10 +145,10 @@ public class class39 extends class21 { garbageValue = "-1" ) @Export("drawActor2d") - static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) { - if (var0 != null && var0.isVisible()) { - if (var0 instanceof NPC) { - NPCDefinition var6 = ((NPC)var0).definition; + static final void drawActor2d(Actor actor, int var1, int var2, int var3, int var4, int var5) { + if (actor != null && actor.isVisible()) { + if (actor instanceof NPC) { + NPCDefinition var6 = ((NPC)actor).definition; if (var6.transforms != null) { var6 = var6.transform(); } @@ -162,8 +162,8 @@ public class class39 extends class21 { int[] var7 = Players.Players_indices; byte var8 = 0; Player var9; - if (var1 < var77 && var0.playerCycle == Client.cycle) { - var9 = (Player)var0; + if (var1 < var77 && actor.playerCycle == Client.cycle) { + var9 = (Player)actor; boolean var10; if (Client.field210 == 0) { var10 = false; @@ -188,87 +188,87 @@ public class class39 extends class21 { } if (var10) { - Player var79 = (Player)var0; + Player var79 = (Player)actor; if (var1 < var77) { - DevicePcmPlayerProvider.method840(var0, var0.defaultHeight + 15); + DevicePcmPlayerProvider.method840(actor, actor.defaultHeight + 15); AbstractFont var81 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); - byte var84 = 9; - var81.drawCentered(var79.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var84, 16777215, 0); + byte var83 = 9; + var81.drawCentered(var79.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var83, 16777215, 0); var8 = 18; } } } int var78 = -2; - int var24; - int var25; + int var15; int var80; int var82; + int var84; int var85; - if (!var0.healthBars.isEmpty()) { - DevicePcmPlayerProvider.method840(var0, var0.defaultHeight + 15); + if (!actor.healthBars.isEmpty()) { + DevicePcmPlayerProvider.method840(actor, actor.defaultHeight + 15); - for (HealthBar var83 = (HealthBar)var0.healthBars.last(); var83 != null; var83 = (HealthBar)var0.healthBars.previous()) { - HealthBarUpdate var15 = var83.get(Client.cycle); - if (var15 == null) { - if (var83.isEmpty()) { - var83.remove(); + for (HealthBar var16 = (HealthBar)actor.healthBars.last(); var16 != null; var16 = (HealthBar)actor.healthBars.previous()) { + HealthBarUpdate var17 = var16.get(Client.cycle); + if (var17 == null) { + if (var16.isEmpty()) { + var16.remove(); } } else { - HealthBarDefinition var16 = var83.definition; - Sprite var17 = var16.getSprite2(); - Sprite var18 = var16.getSprite1(); - int var19 = 0; - if (var17 != null && var18 != null) { - if (var16.widthPadding * 2 < var18.subWidth) { - var19 = var16.widthPadding; + HealthBarDefinition var18 = var16.definition; + Sprite var19 = var18.getSprite2(); + Sprite var20 = var18.getSprite1(); + int var21 = 0; + if (var19 != null && var20 != null) { + if (var18.widthPadding * 2 < var20.subWidth) { + var21 = var18.widthPadding; } - var80 = var18.subWidth - var19 * 2; + var85 = var20.subWidth - var21 * 2; } else { - var80 = var16.width; + var85 = var18.width; } - int var20 = 255; - boolean var21 = true; - int var22 = Client.cycle - var15.cycle; - int var23 = var80 * var15.health2 / var16.width; - if (var15.cycleOffset > var22) { - var24 = var16.int4 == 0 ? 0 : var16.int4 * (var22 / var16.int4); - var82 = var80 * var15.health / var16.width; - var25 = var24 * (var23 - var82) / var15.cycleOffset + var82; + int var22 = 255; + boolean var23 = true; + int var24 = Client.cycle - var17.cycle; + int var25 = var85 * var17.health2 / var18.width; + if (var17.cycleOffset > var24) { + var80 = var18.int4 == 0 ? 0 : var18.int4 * (var24 / var18.int4); + var84 = var85 * var17.health / var18.width; + var82 = var80 * (var25 - var84) / var17.cycleOffset + var84; } else { - var25 = var23; - var24 = var15.cycleOffset + var16.int5 - var22; - if (var16.int3 >= 0) { - var20 = (var24 << 8) / (var16.int5 - var16.int3); + var82 = var25; + var80 = var17.cycleOffset + var18.int5 - var24; + if (var18.int3 >= 0) { + var22 = (var80 << 8) / (var18.int5 - var18.int3); } } - if (var15.health2 > 0 && var25 < 1) { - var25 = 1; + if (var17.health2 > 0 && var82 < 1) { + var82 = 1; } - if (var17 != null && var18 != null) { - if (var80 == var25) { - var25 += var19 * 2; + if (var19 != null && var20 != null) { + if (var85 == var82) { + var82 += var21 * 2; } else { - var25 += var19; + var82 += var21; } - var24 = var17.subHeight; - var78 += var24; - var82 = var2 + Client.viewportTempX - (var80 >> 1); - var85 = var3 + Client.viewportTempY - var78; - var82 -= var19; - if (var20 >= 0 && var20 < 255) { - var17.method310(var82, var85, var20); - Rasterizer2D.Rasterizer2D_expandClip(var82, var85, var82 + var25, var85 + var24); - var18.method310(var82, var85, var20); + var80 = var19.subHeight; + var78 += var80; + var84 = var2 + Client.viewportTempX - (var85 >> 1); + var15 = var3 + Client.viewportTempY - var78; + var84 -= var21; + if (var22 >= 0 && var22 < 255) { + var19.method310(var84, var15, var22); + Rasterizer2D.Rasterizer2D_expandClip(var84, var15, var84 + var82, var15 + var80); + var20.method310(var84, var15, var22); } else { - var17.drawAt2(var82, var85); - Rasterizer2D.Rasterizer2D_expandClip(var82, var85, var25 + var82, var24 + var85); - var18.drawAt2(var82, var85); + var19.drawAt2(var84, var15); + Rasterizer2D.Rasterizer2D_expandClip(var84, var15, var82 + var84, var80 + var15); + var20.drawAt2(var84, var15); } Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); @@ -276,10 +276,10 @@ public class class39 extends class21 { } else { var78 += 5; if (Client.viewportTempX > -1) { - var24 = var2 + Client.viewportTempX - (var80 >> 1); - var82 = var3 + Client.viewportTempY - var78; - Rasterizer2D.Rasterizer2D_fillRectangle(var24, var82, var25, 5, 65280); - Rasterizer2D.Rasterizer2D_fillRectangle(var24 + var25, var82, var80 - var25, 5, 16711680); + var80 = var2 + Client.viewportTempX - (var85 >> 1); + var84 = var3 + Client.viewportTempY - var78; + Rasterizer2D.Rasterizer2D_fillRectangle(var80, var84, var82, 5, 65280); + Rasterizer2D.Rasterizer2D_fillRectangle(var80 + var82, var84, var85 - var82, 5, 16711680); } var78 += 2; @@ -294,13 +294,13 @@ public class class39 extends class21 { var78 += var8; if (var1 < var77) { - var9 = (Player)var0; + var9 = (Player)actor; if (var9.isHidden) { return; } if (var9.headIconPk != -1 || var9.headIconPrayer != -1) { - DevicePcmPlayerProvider.method840(var0, var0.defaultHeight + 15); + DevicePcmPlayerProvider.method840(actor, actor.defaultHeight + 15); if (Client.viewportTempX > -1) { if (var9.headIconPk != -1) { var78 += 25; @@ -315,51 +315,51 @@ public class class39 extends class21 { } if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { - DevicePcmPlayerProvider.method840(var0, var0.defaultHeight + 15); + DevicePcmPlayerProvider.method840(actor, actor.defaultHeight + 15); if (Client.viewportTempX > -1) { var78 += Player.headIconHintSprites[1].subHeight; Player.headIconHintSprites[1].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var78); } } } else { - NPCDefinition var86 = ((NPC)var0).definition; + NPCDefinition var86 = ((NPC)actor).definition; if (var86.transforms != null) { var86 = var86.transform(); } if (var86.headIconPrayer >= 0 && var86.headIconPrayer < ClientPreferences.headIconPrayerSprites.length) { - DevicePcmPlayerProvider.method840(var0, var0.defaultHeight + 15); + DevicePcmPlayerProvider.method840(actor, actor.defaultHeight + 15); if (Client.viewportTempX > -1) { ClientPreferences.headIconPrayerSprites[var86.headIconPrayer].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); } } if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var77] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { - DevicePcmPlayerProvider.method840(var0, var0.defaultHeight + 15); + DevicePcmPlayerProvider.method840(actor, actor.defaultHeight + 15); if (Client.viewportTempX > -1) { Player.headIconHintSprites[0].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); } } } - if (var0.overheadText != null && (var1 >= var77 || !var0.field11 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { - DevicePcmPlayerProvider.method840(var0, var0.defaultHeight); + if (actor.overheadText != null && (var1 >= var77 || !actor.field11 && (Client.publicChatMode == 4 || !actor.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)actor).isFriend())))) { + DevicePcmPlayerProvider.method840(actor, actor.defaultHeight); if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { - Client.overheadTextXOffsets[Client.overheadTextCount] = class2.fontBold12.stringWidth(var0.overheadText) / 2; + Client.overheadTextXOffsets[Client.overheadTextCount] = class2.fontBold12.stringWidth(actor.overheadText) / 2; Client.overheadTextAscents[Client.overheadTextCount] = class2.fontBold12.ascent; Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX; Client.overheadTextYs[Client.overheadTextCount] = Client.viewportTempY; - Client.overheadTextColors[Client.overheadTextCount] = var0.overheadTextColor; - Client.overheadTextEffects[Client.overheadTextCount] = var0.overheadTextEffect; - Client.overheadTextCyclesRemaining[Client.overheadTextCount] = var0.overheadTextCyclesRemaining; - Client.overheadText[Client.overheadTextCount] = var0.overheadText; + Client.overheadTextColors[Client.overheadTextCount] = actor.overheadTextColor; + Client.overheadTextEffects[Client.overheadTextCount] = actor.overheadTextEffect; + Client.overheadTextCyclesRemaining[Client.overheadTextCount] = actor.overheadTextCyclesRemaining; + Client.overheadText[Client.overheadTextCount] = actor.overheadText; ++Client.overheadTextCount; } } for (int var88 = 0; var88 < 4; ++var88) { - int var87 = var0.hitSplatCycles[var88]; - int var89 = var0.hitSplatTypes[var88]; + int var87 = actor.hitSplatCycles[var88]; + int var89 = actor.hitSplatTypes[var88]; HitSplatDefinition var90 = null; int var91 = 0; if (var89 >= 0) { @@ -367,12 +367,12 @@ public class class39 extends class21 { continue; } - var90 = LoginScreenAnimation.getHitSplatDefinition(var0.hitSplatTypes[var88]); + var90 = LoginScreenAnimation.getHitSplatDefinition(actor.hitSplatTypes[var88]); var91 = var90.field387; if (var90 != null && var90.transforms != null) { var90 = var90.transform(); if (var90 == null) { - var0.hitSplatCycles[var88] = -1; + actor.hitSplatCycles[var88] = -1; continue; } } @@ -380,10 +380,10 @@ public class class39 extends class21 { continue; } - var80 = var0.hitSplatTypes2[var88]; + var85 = actor.hitSplatTypes2[var88]; HitSplatDefinition var92 = null; - if (var80 >= 0) { - var92 = LoginScreenAnimation.getHitSplatDefinition(var80); + if (var85 >= 0) { + var92 = LoginScreenAnimation.getHitSplatDefinition(var85); if (var92 != null && var92.transforms != null) { var92 = var92.transform(); } @@ -391,9 +391,9 @@ public class class39 extends class21 { if (var87 - var91 <= Client.cycle) { if (var90 == null) { - var0.hitSplatCycles[var88] = -1; + actor.hitSplatCycles[var88] = -1; } else { - DevicePcmPlayerProvider.method840(var0, var0.defaultHeight / 2); + DevicePcmPlayerProvider.method840(actor, actor.defaultHeight / 2); if (Client.viewportTempX > -1) { if (var88 == 1) { Client.viewportTempY -= 20; @@ -413,10 +413,10 @@ public class class39 extends class21 { Sprite var94 = null; Sprite var95 = null; Sprite var96 = null; + var84 = 0; + var15 = 0; + var80 = 0; var82 = 0; - var85 = 0; - var24 = 0; - var25 = 0; int var26 = 0; int var27 = 0; int var28 = 0; @@ -437,7 +437,7 @@ public class class39 extends class21 { var93 = var90.method123(); int var43; if (var93 != null) { - var82 = var93.subWidth; + var84 = var93.subWidth; var43 = var93.subHeight; if (var43 > var42) { var42 = var43; @@ -448,7 +448,7 @@ public class class39 extends class21 { var94 = var90.method124(); if (var94 != null) { - var85 = var94.subWidth; + var15 = var94.subWidth; var43 = var94.subHeight; if (var43 > var42) { var42 = var43; @@ -459,7 +459,7 @@ public class class39 extends class21 { var95 = var90.method125(); if (var95 != null) { - var24 = var95.subWidth; + var80 = var95.subWidth; var43 = var95.subHeight; if (var43 > var42) { var42 = var43; @@ -470,7 +470,7 @@ public class class39 extends class21 { var96 = var90.method126(); if (var96 != null) { - var25 = var96.subWidth; + var82 = var96.subWidth; var43 = var96.subHeight; if (var43 > var42) { var42 = var43; @@ -544,20 +544,20 @@ public class class39 extends class21 { String var47 = null; boolean var48 = false; int var49 = 0; - var46 = var90.getString(var0.hitSplatValues[var88]); + var46 = var90.getString(actor.hitSplatValues[var88]); int var50 = var44.stringWidth(var46); if (var92 != null) { - var47 = var92.getString(var0.hitSplatValues2[var88]); + var47 = var92.getString(actor.hitSplatValues2[var88]); var49 = var45.stringWidth(var47); } int var51 = 0; int var52 = 0; - if (var85 > 0) { + if (var15 > 0) { if (var95 == null && var96 == null) { var51 = 1; } else { - var51 = var50 / var85 + 1; + var51 = var50 / var15 + 1; } } @@ -571,21 +571,21 @@ public class class39 extends class21 { int var53 = 0; int var54 = var53; - if (var82 > 0) { - var53 += var82; + if (var84 > 0) { + var53 += var84; } var53 += 2; int var55 = var53; - if (var24 > 0) { - var53 += var24; + if (var80 > 0) { + var53 += var80; } int var56 = var53; int var57 = var53; int var58; - if (var85 > 0) { - var58 = var85 * var51; + if (var15 > 0) { + var58 = var15 * var51; var53 += var58; var57 += (var58 - var50) / 2; } else { @@ -593,8 +593,8 @@ public class class39 extends class21 { } var58 = var53; - if (var25 > 0) { - var53 += var25; + if (var82 > 0) { + var53 += var82; } int var59 = 0; @@ -632,7 +632,7 @@ public class class39 extends class21 { } } - var64 = var0.hitSplatCycles[var88] - Client.cycle; + var64 = actor.hitSplatCycles[var88] - Client.cycle; int var65 = var90.field392 - var64 * var90.field392 / var90.field387; int var66 = var64 * var90.field393 / var90.field387 + -var90.field393; int var67 = var65 + (var2 + Client.viewportTempX - (var53 >> 1)); @@ -680,7 +680,7 @@ public class class39 extends class21 { if (var94 != null) { for (var76 = 0; var76 < var51; ++var76) { - var94.method310(var85 * var76 + (var67 + var56 - var27), var68, var75); + var94.method310(var15 * var76 + (var67 + var56 - var27), var68, var75); } } @@ -721,7 +721,7 @@ public class class39 extends class21 { if (var94 != null) { for (var76 = 0; var76 < var51; ++var76) { - var94.drawAt2(var85 * var76 + (var56 + var67 - var27), var68); + var94.drawAt2(var15 * var76 + (var56 + var67 - var27), var68); } } @@ -810,11 +810,11 @@ public class class39 extends class21 { WorldMapRegion.notRevalidateWidgetScroll(var1.children, var1.id, var3, var4, var2); } - WidgetGroupParent var5 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var1.id); + InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); if (var5 != null) { int var6 = var5.group; - if (GroundItemPile.loadWidgetGroup(var6)) { - WorldMapRegion.notRevalidateWidgetScroll(Widget.widgets[var6], -1, var3, var4, var2); + if (GroundItemPile.loadInterface(var6)) { + WorldMapRegion.notRevalidateWidgetScroll(Widget.interfaceComponents[var6], -1, var3, var4, var2); } } diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java index 5aae33d902..b23775676d 100644 --- a/runescape-client/src/main/java/class4.java +++ b/runescape-client/src/main/java/class4.java @@ -1,5 +1,6 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("o") final class class4 implements class0 { @@ -7,7 +8,7 @@ final class class4 implements class0 { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field1158; + public static AbstractArchive field1158; @ObfuscatedName("m") @ObfuscatedSignature( @@ -51,7 +52,7 @@ final class class4 implements class0 { garbageValue = "-843046456" ) public static void method55() { - OverlayDefinition.field664.clear(); + FloorOverlayDefinition.field664.clear(); } @ObfuscatedName("v") @@ -61,15 +62,15 @@ final class class4 implements class0 { ) static int method54(int var0, Script var1, boolean var2) { String var3; - if (var0 == 3100) { + if (var0 == ScriptOpcodes.MES) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - WorldMapIcon1.method219(0, "", var3); + WorldMapIcon1.addGameMessage(0, "", var3); return 1; - } else if (var0 == 3101) { + } else if (var0 == ScriptOpcodes.ANIM) { RouteStrategy.Interpreter_intStackSize -= 2; - class234.method4534(Canvas.localPlayer, Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize], Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); + class234.performPlayerAnimation(Canvas.localPlayer, Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize], Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); return 1; - } else if (var0 == 3103) { + } else if (var0 == ScriptOpcodes.IF_CLOSE) { if (!Interpreter.field424) { Interpreter.field423 = true; } @@ -78,7 +79,7 @@ final class class4 implements class0 { } else { int var4; PacketBufferNode var5; - if (var0 == 3104) { + if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var4 = 0; if (UserComparator4.method3336(var3)) { @@ -89,14 +90,14 @@ final class class4 implements class0 { var5.packetBuffer.writeInt(var4); Client.packetWriter.method241(var5); return 1; - } else if (var0 == 3105) { + } else if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var5 = Interpreter.method1915(ClientPacket.field317, Client.packetWriter.isaacCipher); var5.packetBuffer.writeByte(var3.length() + 1); var5.packetBuffer.writeStringCp1252NullTerminated(var3); Client.packetWriter.method241(var5); return 1; - } else if (var0 == 3106) { + } else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var5 = Interpreter.method1915(ClientPacket.field230, Client.packetWriter.isaacCipher); var5.packetBuffer.writeByte(var3.length() + 1); @@ -106,12 +107,12 @@ final class class4 implements class0 { } else { String var6; int var7; - if (var0 == 3107) { + if (var0 == ScriptOpcodes.OPPLAYER) { var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; WorldMapSection2.method583(var7, var6); return 1; - } else if (var0 == 3108) { + } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { RouteStrategy.Interpreter_intStackSize -= 3; var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; @@ -119,61 +120,61 @@ final class class4 implements class0 { Widget var11 = Huffman.getWidget(var13); Players.clickWidget(var11, var7, var4); return 1; - } else if (var0 == 3109) { + } else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) { RouteStrategy.Interpreter_intStackSize -= 2; var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; - Widget var12 = var2 ? WorldMapIcon1.field1030 : class12.field1111; + Widget var12 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111; Players.clickWidget(var12, var7, var4); return 1; - } else if (var0 == 3110) { + } else if (var0 == ScriptOpcodes.MOUSECAM) { AbstractRasterProvider.mouseCam = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; - } else if (var0 == 3111) { + } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.roofsHidden ? 1 : 0; return 1; - } else if (var0 == 3112) { + } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) { ReflectionCheck.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; WorldMapSection0.savePreferences(); return 1; } else { boolean var8; - if (var0 == 3113) { + if (var0 == ScriptOpcodes.OPENURL) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - WorldMapCacheName.method635(var3, var8, false); + WorldMapCacheName.openURL(var3, var8, false); return 1; - } else if (var0 == 3115) { + } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var5 = Interpreter.method1915(ClientPacket.field264, Client.packetWriter.isaacCipher); var5.packetBuffer.writeShort(var7); Client.packetWriter.method241(var5); return 1; - } else if (var0 == 3116) { + } else if (var0 == ScriptOpcodes.BUG_REPORT) { var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_stringStackSize -= 2; var6 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; - String var10 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; + String var9 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; if (var6.length() > 500) { return 1; - } else if (var10.length() > 500) { + } else if (var9.length() > 500) { return 1; } else { - PacketBufferNode var9 = Interpreter.method1915(ClientPacket.field238, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShort(1 + WorldMapRegion.method550(var6) + WorldMapRegion.method550(var10)); - var9.packetBuffer.writeStringCp1252NullTerminated(var6); - var9.packetBuffer.writeByte(var7); - var9.packetBuffer.writeStringCp1252NullTerminated(var10); - Client.packetWriter.method241(var9); + PacketBufferNode var10 = Interpreter.method1915(ClientPacket.field238, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeShort(1 + WorldMapRegion.stringCp1252NullTerminatedByteSize(var6) + WorldMapRegion.stringCp1252NullTerminatedByteSize(var9)); + var10.packetBuffer.writeStringCp1252NullTerminated(var6); + var10.packetBuffer.writeByte(var7); + var10.packetBuffer.writeStringCp1252NullTerminated(var9); + Client.packetWriter.method241(var10); return 1; } - } else if (var0 == 3117) { + } else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) { Client.shiftClickDrop = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; - } else if (var0 == 3118) { + } else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) { Client.showMouseOverText = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; - } else if (var0 == 3119) { + } else if (var0 == ScriptOpcodes.RENDERSELF) { Client.renderSelf = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; } else if (var0 == 3120) { @@ -211,22 +212,22 @@ final class class4 implements class0 { } else if (var0 == 3124) { Client.field210 = 0; return 1; - } else if (var0 == 3125) { + } else if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) { Client.showMouseCross = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; - } else if (var0 == 3126) { + } else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) { Client.showLoadingMessages = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; - } else if (var0 == 3127) { - WorldMapAreaData.method705(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1); + } else if (var0 == ScriptOpcodes.SETTAPTODROP) { + WorldMapAreaData.setTapToDrop(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1); return 1; - } else if (var0 == 3128) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class206.method4028() ? 1 : 0; + } else if (var0 == ScriptOpcodes.GETTAPTODROP) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class206.getTapToDrop() ? 1 : 0; return 1; - } else if (var0 == 3129) { + } else if (var0 == ScriptOpcodes.SETOCULUSORBSPEED) { RouteStrategy.Interpreter_intStackSize -= 2; Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; - Client.field197 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; return 1; } else if (var0 == 3130) { RouteStrategy.Interpreter_intStackSize -= 2; @@ -234,7 +235,7 @@ final class class4 implements class0 { } else if (var0 == 3131) { --RouteStrategy.Interpreter_intStackSize; return 1; - } else if (var0 == 3132) { + } else if (var0 == ScriptOpcodes.GETCANVASSIZE) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = SoundCache.canvasWidth; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Huffman.canvasHeight; return 1; @@ -262,17 +263,17 @@ final class class4 implements class0 { return 1; } else if (var0 == 3140) { Client.field151 = 3; - Client.field153 = var2 ? WorldMapIcon1.field1030.id : class12.field1111.id; + Client.field153 = var2 ? WorldMapIcon1.field1030.id : GrandExchangeOfferAgeComparator.field1111.id; return 1; - } else if (var0 == 3141) { + } else if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; ReflectionCheck.clientPreferences.hideUsername = var8; WorldMapSection0.savePreferences(); return 1; - } else if (var0 == 3142) { + } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.hideUsername ? 1 : 0; return 1; - } else if (var0 == 3143) { + } else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) { var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; Client.Login_isUsernameRemembered = var8; if (!var8) { @@ -281,12 +282,12 @@ final class class4 implements class0 { } return 1; - } else if (var0 == 3144) { + } else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; return 1; } else if (var0 == 3145) { return 1; - } else if (var0 == 3146) { + } else if (var0 == ScriptOpcodes.SETTITLEMUSICENABLED) { var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; if (var8 == ReflectionCheck.clientPreferences.titleMusicDisabled) { ReflectionCheck.clientPreferences.titleMusicDisabled = !var8; @@ -294,7 +295,7 @@ final class class4 implements class0 { } return 1; - } else if (var0 == 3147) { + } else if (var0 == ScriptOpcodes.GETTITLEMUSICENABLED) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.titleMusicDisabled ? 0 : 1; return 1; } else if (var0 == 3148) { diff --git a/runescape-client/src/main/java/class40.java b/runescape-client/src/main/java/class40.java index 052402ebef..5e353ec340 100644 --- a/runescape-client/src/main/java/class40.java +++ b/runescape-client/src/main/java/class40.java @@ -9,8 +9,8 @@ public class class40 { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache7") - static IndexCache indexCache7; + @Export("archive7") + static Archive archive7; @ObfuscatedName("gs") @Export("regionLandArchives") static byte[][] regionLandArchives; @@ -716,7 +716,7 @@ public class class40 { int var22; int var24; if (!Client.isCameraLocked) { - var4 = Client.cameraPitchTarget; + var4 = Client.camAngleX; if (Client.field202 / 256 > var4) { var4 = Client.field202 / 256; } @@ -725,42 +725,42 @@ public class class40 { var4 = Client.field142[4] + 128; } - var15 = Client.minimapOrientation & 2047; + var13 = Client.camAngleY & 2047; var6 = MouseHandler.oculusOrbFocalPointX; - var22 = MouseRecorder.field566; - var24 = ScriptEvent.oculusOrbFocalPointY; - var9 = var4 * 3 + 600; - var10 = ScriptEvent.method1176(var9, var3); - var11 = 2048 - var4 & 2047; - var12 = 2048 - var15 & 2047; - var13 = 0; - var14 = 0; - int var16 = var10; + var14 = MouseRecorder.field566; + var15 = ScriptEvent.oculusOrbFocalPointY; + var22 = var4 * 3 + 600; + var24 = ScriptEvent.method1176(var22, var3); + var9 = 2048 - var4 & 2047; + var10 = 2048 - var13 & 2047; + var11 = 0; + var12 = 0; + int var16 = var24; int var17; int var18; int var19; - if (var11 != 0) { - var17 = Rasterizer3D.Rasterizer3D_sine[var11]; - var18 = Rasterizer3D.Rasterizer3D_cosine[var11]; - var19 = var14 * var18 - var17 * var10 >> 16; - var16 = var18 * var10 + var17 * var14 >> 16; - var14 = var19; + if (var9 != 0) { + var17 = Rasterizer3D.Rasterizer3D_sine[var9]; + var18 = Rasterizer3D.Rasterizer3D_cosine[var9]; + var19 = var12 * var18 - var17 * var24 >> 16; + var16 = var18 * var24 + var17 * var12 >> 16; + var12 = var19; } - if (var12 != 0) { - var17 = Rasterizer3D.Rasterizer3D_sine[var12]; - var18 = Rasterizer3D.Rasterizer3D_cosine[var12]; - var19 = var16 * var17 + var18 * var13 >> 16; - var16 = var16 * var18 - var17 * var13 >> 16; - var13 = var19; + if (var10 != 0) { + var17 = Rasterizer3D.Rasterizer3D_sine[var10]; + var18 = Rasterizer3D.Rasterizer3D_cosine[var10]; + var19 = var16 * var17 + var18 * var11 >> 16; + var16 = var16 * var18 - var17 * var11 >> 16; + var11 = var19; } - WorldMapSection1.cameraX = var6 - var13; - GrandExchangeEvents.cameraY = var22 - var14; - class11.cameraZ = var24 - var16; + WorldMapSection1.cameraX = var6 - var11; + GrandExchangeEvents.cameraY = var14 - var12; + GrandExchangeOfferNameComparator.cameraZ = var15 - var16; WorldMapIcon1.cameraPitch = var4; - MusicPatchNode.cameraYaw = var15; - if (Client.oculusOrbState == 1 && Client.rights >= 2 && Client.cycle % 50 == 0 && (MouseHandler.oculusOrbFocalPointX >> 7 != Canvas.localPlayer.x >> 7 || ScriptEvent.oculusOrbFocalPointY >> 7 != Canvas.localPlayer.y >> 7)) { + MusicPatchNode.cameraYaw = var13; + if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (MouseHandler.oculusOrbFocalPointX >> 7 != Canvas.localPlayer.x >> 7 || ScriptEvent.oculusOrbFocalPointY >> 7 != Canvas.localPlayer.y >> 7)) { var17 = Canvas.localPlayer.plane; var18 = (MouseHandler.oculusOrbFocalPointX >> 7) + class50.baseX; var19 = (ScriptEvent.oculusOrbFocalPointY >> 7) + GraphicsObject.baseY; @@ -774,38 +774,38 @@ public class class40 { } if (!Client.isCameraLocked) { - var4 = UnitPriceComparator.method131(); + var4 = GrandExchangeOfferUnitPriceComparator.method131(); } else { var4 = Login.method2061(); } - var15 = WorldMapSection1.cameraX; + var13 = WorldMapSection1.cameraX; var6 = GrandExchangeEvents.cameraY; - var22 = class11.cameraZ; - var24 = WorldMapIcon1.cameraPitch; - var9 = MusicPatchNode.cameraYaw; + var14 = GrandExchangeOfferNameComparator.cameraZ; + var15 = WorldMapIcon1.cameraPitch; + var22 = MusicPatchNode.cameraYaw; - for (var10 = 0; var10 < 5; ++var10) { - if (Client.field139[var10]) { - var11 = (int)(Math.random() * (double)(Client.field141[var10] * 2 + 1) - (double)Client.field141[var10] + Math.sin((double)Client.field144[var10] * ((double)Client.field143[var10] / 100.0D)) * (double)Client.field142[var10]); - if (var10 == 0) { - WorldMapSection1.cameraX += var11; + for (var24 = 0; var24 < 5; ++var24) { + if (Client.field139[var24]) { + var9 = (int)(Math.random() * (double)(Client.field141[var24] * 2 + 1) - (double)Client.field141[var24] + Math.sin((double)Client.field144[var24] * ((double)Client.field143[var24] / 100.0D)) * (double)Client.field142[var24]); + if (var24 == 0) { + WorldMapSection1.cameraX += var9; } - if (var10 == 1) { - GrandExchangeEvents.cameraY += var11; + if (var24 == 1) { + GrandExchangeEvents.cameraY += var9; } - if (var10 == 2) { - class11.cameraZ += var11; + if (var24 == 2) { + GrandExchangeOfferNameComparator.cameraZ += var9; } - if (var10 == 3) { - MusicPatchNode.cameraYaw = var11 + MusicPatchNode.cameraYaw & 2047; + if (var24 == 3) { + MusicPatchNode.cameraYaw = var9 + MusicPatchNode.cameraYaw & 2047; } - if (var10 == 4) { - WorldMapIcon1.cameraPitch += var11; + if (var24 == 4) { + WorldMapIcon1.cameraPitch += var9; if (WorldMapIcon1.cameraPitch < 128) { WorldMapIcon1.cameraPitch = 128; } @@ -817,18 +817,18 @@ public class class40 { } } - var10 = MouseHandler.MouseHandler_x; - var11 = MouseHandler.MouseHandler_y; + var24 = MouseHandler.MouseHandler_x; + var9 = MouseHandler.MouseHandler_y; if (MouseHandler.MouseHandler_lastButton != 0) { - var10 = MouseHandler.MouseHandler_lastPressedX; - var11 = MouseHandler.MouseHandler_lastPressedY; + var24 = MouseHandler.MouseHandler_lastPressedX; + var9 = MouseHandler.MouseHandler_lastPressedY; } - if (var10 >= var0 && var10 < var0 + var2 && var11 >= var1 && var11 < var3 + var1) { - var12 = var10 - var0; - var13 = var11 - var1; - ViewportMouse.ViewportMouse_x = var12; - ViewportMouse.ViewportMouse_y = var13; + if (var24 >= var0 && var24 < var0 + var2 && var9 >= var1 && var9 < var3 + var1) { + var10 = var24 - var0; + var11 = var9 - var1; + ViewportMouse.ViewportMouse_x = var10; + ViewportMouse.ViewportMouse_y = var11; ViewportMouse.ViewportMouse_isInViewport = true; ViewportMouse.ViewportMouse_entityCount = 0; ViewportMouse.ViewportMouse_false0 = false; @@ -840,39 +840,39 @@ public class class40 { class13.playPcmPlayers(); Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); class13.playPcmPlayers(); - var12 = Rasterizer3D.Rasterizer3D_zoom; + var10 = Rasterizer3D.Rasterizer3D_zoom; Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; - class65.scene.draw(WorldMapSection1.cameraX, GrandExchangeEvents.cameraY, class11.cameraZ, WorldMapIcon1.cameraPitch, MusicPatchNode.cameraYaw, var4); - Rasterizer3D.Rasterizer3D_zoom = var12; + class65.scene.draw(WorldMapSection1.cameraX, GrandExchangeEvents.cameraY, GrandExchangeOfferNameComparator.cameraZ, WorldMapIcon1.cameraPitch, MusicPatchNode.cameraYaw, var4); + Rasterizer3D.Rasterizer3D_zoom = var10; class13.playPcmPlayers(); class65.scene.clearTempGameObjects(); UrlRequester.method3258(var0, var1, var2, var3); - UnitPriceComparator.method136(var0, var1); + GrandExchangeOfferUnitPriceComparator.method136(var0, var1); ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field183); Client.field208 = 0; - var13 = (Canvas.localPlayer.x >> 7) + class50.baseX; - var14 = (Canvas.localPlayer.y >> 7) + GraphicsObject.baseY; - if (var13 >= 3053 && var13 <= 3156 && var14 >= 3056 && var14 <= 3136) { + var11 = (Canvas.localPlayer.x >> 7) + class50.baseX; + var12 = (Canvas.localPlayer.y >> 7) + GraphicsObject.baseY; + if (var11 >= 3053 && var11 <= 3156 && var12 >= 3056 && var12 <= 3136) { Client.field208 = 1; } - if (var13 >= 3072 && var13 <= 3118 && var14 >= 9492 && var14 <= 9535) { + if (var11 >= 3072 && var11 <= 3118 && var12 >= 9492 && var12 <= 9535) { Client.field208 = 1; } - if (Client.field208 == 1 && var13 >= 3139 && var13 <= 3199 && var14 >= 3008 && var14 <= 3062) { + if (Client.field208 == 1 && var11 >= 3139 && var11 <= 3199 && var12 >= 3008 && var12 <= 3062) { Client.field208 = 0; } - WorldMapSection1.cameraX = var15; + WorldMapSection1.cameraX = var13; GrandExchangeEvents.cameraY = var6; - class11.cameraZ = var22; - WorldMapIcon1.cameraPitch = var24; - MusicPatchNode.cameraYaw = var9; + GrandExchangeOfferNameComparator.cameraZ = var14; + WorldMapIcon1.cameraPitch = var15; + MusicPatchNode.cameraYaw = var22; if (Client.isLoading) { byte var25 = 0; - var14 = var25 + NetCache.NetCache_pendingPriorityWritesCount + NetCache.NetCache_pendingPriorityResponsesCount; - if (var14 == 0) { + var12 = var25 + NetCache.NetCache_pendingPriorityWritesCount + NetCache.NetCache_pendingPriorityResponsesCount; + if (var12 == 0) { Client.isLoading = false; } } diff --git a/runescape-client/src/main/java/class48.java b/runescape-client/src/main/java/class48.java index 802a80da79..1f1da473c8 100644 --- a/runescape-client/src/main/java/class48.java +++ b/runescape-client/src/main/java/class48.java @@ -42,16 +42,21 @@ public class class48 { if (var2 == 0) { var3 = null; } else { - label29: { - for (int var4 = 0; var4 < var2; ++var4) { - var1 = Huffman.getWidget(var1.parentId); - if (var1 == null) { - var3 = null; - break label29; - } + int var4 = 0; + + while (true) { + if (var4 >= var2) { + var3 = var1; + break; } - var3 = var1; + var1 = Huffman.getWidget(var1.parentId); + if (var1 == null) { + var3 = null; + break; + } + + ++var4; } } diff --git a/runescape-client/src/main/java/class50.java b/runescape-client/src/main/java/class50.java index 7ffa296a42..1cf6f12438 100644 --- a/runescape-client/src/main/java/class50.java +++ b/runescape-client/src/main/java/class50.java @@ -31,11 +31,11 @@ public class class50 { if (var1 != null) { return var1; } else { - byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_indexCache.takeRecord(13, var0); + byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); var1 = new SpotAnimationDefinition(); var1.id = var0; if (var2 != null) { - var1.read(new Buffer(var2)); + var1.decode(new Buffer(var2)); } SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); @@ -54,14 +54,14 @@ public class class50 { if (var1 != null) { return var1; } else { - byte[] var2 = ObjectDefinition.ObjectDefinition_indexCache.takeRecord(6, var0); + byte[] var2 = ObjectDefinition.ObjectDefinition_archive.takeFile(6, var0); var1 = new ObjectDefinition(); var1.id = var0; if (var2 != null) { - var1.read(new Buffer(var2)); + var1.decode(new Buffer(var2)); } - var1.init(); + var1.postDecode(); if (var1.isSolid) { var1.interactType = 0; var1.boolean1 = false; @@ -78,8 +78,8 @@ public class class50 { garbageValue = "83" ) @Export("loadRegions") - static final void loadRegions(boolean var0, PacketBuffer var1) { - Client.isInInstance = var0; + static final void loadRegions(boolean isInInstance, PacketBuffer packetBuffer) { + Client.isInInstance = isInInstance; int var2; int var3; int var4; @@ -87,19 +87,19 @@ public class class50 { int var6; int var7; if (!Client.isInInstance) { - var2 = var1.method67(); - var3 = var1.method66(); - int var8 = var1.readUnsignedShort(); + var2 = packetBuffer.method67(); + var3 = packetBuffer.method66(); + int var8 = packetBuffer.readUnsignedShort(); class190.xteaKeys = new int[var8][4]; for (var4 = 0; var4 < var8; ++var4) { for (var5 = 0; var5 < 4; ++var5) { - class190.xteaKeys[var4][var5] = var1.readInt(); + class190.xteaKeys[var4][var5] = packetBuffer.readInt(); } } class308.regions = new int[var8]; - IndexCacheLoader.regionMapArchiveIds = new int[var8]; + ArchiveLoader.regionMapArchiveIds = new int[var8]; MouseHandler.regionLandArchiveIds = new int[var8]; class40.regionLandArchives = new byte[var8][]; HealthBarUpdate.regionMapArchives = new byte[var8][]; @@ -119,8 +119,8 @@ public class class50 { var7 = var6 + (var5 << 8); if (!var9 || var6 != 49 && var6 != 149 && var6 != 147 && var5 != 50 && (var5 != 49 || var6 != 47)) { class308.regions[var8] = var7; - IndexCacheLoader.regionMapArchiveIds[var8] = SecureRandomFuture.indexCache5.getArchiveId("m" + var5 + "_" + var6); - MouseHandler.regionLandArchiveIds[var8] = SecureRandomFuture.indexCache5.getArchiveId("l" + var5 + "_" + var6); + ArchiveLoader.regionMapArchiveIds[var8] = SecureRandomFuture.archive5.getGroupId("m" + var5 + "_" + var6); + MouseHandler.regionLandArchiveIds[var8] = SecureRandomFuture.archive5.getGroupId("l" + var5 + "_" + var6); ++var8; } } @@ -128,19 +128,19 @@ public class class50 { DynamicObject.method2224(var3, var2, true); } else { - var2 = var1.method66(); - var3 = var1.method67(); - boolean var15 = var1.readUnsignedByte() == 1; - var4 = var1.readUnsignedShort(); - var1.importIndex(); + var2 = packetBuffer.method66(); + var3 = packetBuffer.method67(); + boolean var15 = packetBuffer.readUnsignedByte() == 1; + var4 = packetBuffer.readUnsignedShort(); + packetBuffer.importIndex(); int var16; for (var5 = 0; var5 < 4; ++var5) { for (var6 = 0; var6 < 13; ++var6) { for (var7 = 0; var7 < 13; ++var7) { - var16 = var1.readBits(1); + var16 = packetBuffer.readBits(1); if (var16 == 1) { - Client.instanceChunkTemplates[var5][var6][var7] = var1.readBits(26); + Client.instanceChunkTemplates[var5][var6][var7] = packetBuffer.readBits(26); } else { Client.instanceChunkTemplates[var5][var6][var7] = -1; } @@ -148,17 +148,17 @@ public class class50 { } } - var1.exportIndex(); + packetBuffer.exportIndex(); class190.xteaKeys = new int[var4][4]; for (var5 = 0; var5 < var4; ++var5) { for (var6 = 0; var6 < 4; ++var6) { - class190.xteaKeys[var5][var6] = var1.readInt(); + class190.xteaKeys[var5][var6] = packetBuffer.readInt(); } } class308.regions = new int[var4]; - IndexCacheLoader.regionMapArchiveIds = new int[var4]; + ArchiveLoader.regionMapArchiveIds = new int[var4]; MouseHandler.regionLandArchiveIds = new int[var4]; class40.regionLandArchives = new byte[var4][]; HealthBarUpdate.regionMapArchives = new byte[var4][]; @@ -185,8 +185,8 @@ public class class50 { class308.regions[var4] = var12; var13 = var12 >> 8 & 255; int var14 = var12 & 255; - IndexCacheLoader.regionMapArchiveIds[var4] = SecureRandomFuture.indexCache5.getArchiveId("m" + var13 + "_" + var14); - MouseHandler.regionLandArchiveIds[var4] = SecureRandomFuture.indexCache5.getArchiveId("l" + var13 + "_" + var14); + ArchiveLoader.regionMapArchiveIds[var4] = SecureRandomFuture.archive5.getGroupId("m" + var13 + "_" + var14); + MouseHandler.regionLandArchiveIds[var4] = SecureRandomFuture.archive5.getGroupId("l" + var13 + "_" + var14); ++var4; } } diff --git a/runescape-client/src/main/java/class54.java b/runescape-client/src/main/java/class54.java index e4f0932858..7519252f20 100644 --- a/runescape-client/src/main/java/class54.java +++ b/runescape-client/src/main/java/class54.java @@ -1,6 +1,7 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("bs") public final class class54 { @@ -42,7 +43,7 @@ public final class class54 { ReflectionCheck.clientPreferences.titleMusicDisabled = !ReflectionCheck.clientPreferences.titleMusicDisabled; WorldMapSection0.savePreferences(); if (!ReflectionCheck.clientPreferences.titleMusicDisabled) { - class204.method4011(UserComparator3.indexCache6, "scape main", "", 255, false); + class204.method4011(UserComparator3.archive6, "scape main", "", 255, false); } else { class214.midiPcmStream.clear(); class214.field1129 = 1; @@ -56,7 +57,7 @@ public final class class54 { } long var15 = class203.currentTimeMs(); - if (AbstractIndexCache.method4585() && -1L == Login.field472) { + if (AbstractArchive.method4585() && -1L == Login.field472) { Login.field472 = var15; if (Login.field472 > Login.field471) { Login.field471 = Login.field472; @@ -106,7 +107,7 @@ public final class class54 { boolean var8 = false; while (Decimator.method2490()) { - if (IndexStoreAction.field411 == 84) { + if (ArchiveDiskAction.field411 == 84) { var8 = true; } } @@ -114,7 +115,7 @@ public final class class54 { var18 = Varps.loginBoxCenter - 80; var19 = 291; if (var1 == 1 && var2 >= var18 - 75 && var2 <= var18 + 75 && var17 >= var19 - 20 && var17 <= var19 + 20) { - WorldMapCacheName.method635(Message.method1227("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); + WorldMapCacheName.openURL(Message.method1227("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); } var18 = Varps.loginBoxCenter + 80; @@ -152,25 +153,25 @@ public final class class54 { } } } else { - short var9; - int var20; + int var9; + short var20; if (Login.loginIndex != 1) { boolean var10; int var11; short var12; if (Login.loginIndex == 2) { var12 = 201; - var20 = var12 + 52; - if (var1 == 1 && var17 >= var20 - 12 && var17 < var20 + 2) { + var9 = var12 + 52; + if (var1 == 1 && var17 >= var9 - 12 && var17 < var9 + 2) { Login.currentLoginField = 0; } - var20 += 15; - if (var1 == 1 && var17 >= var20 - 12 && var17 < var20 + 2) { + var9 += 15; + if (var1 == 1 && var17 >= var9 - 12 && var17 < var9 + 2) { Login.currentLoginField = 1; } - var20 += 15; + var9 += 15; var12 = 361; if (TilePaint.field907 != null) { var18 = TilePaint.field907.field43 / 2; @@ -181,7 +182,7 @@ public final class class54 { Login.loginIndex = 5; return; case 2: - WorldMapCacheName.method635("https://support.runescape.com/hc/en-gb", true, false); + WorldMapCacheName.openURL("https://support.runescape.com/hc/en-gb", true, false); } } } @@ -252,7 +253,7 @@ public final class class54 { } } - if (IndexStoreAction.field411 == 13) { + if (ArchiveDiskAction.field411 == 13) { Login.loginIndex = 0; Login.Login_username = ""; Login.Login_password = ""; @@ -260,11 +261,11 @@ public final class class54 { Login.otp = ""; Login.field470 = true; } else if (Login.currentLoginField == 0) { - if (IndexStoreAction.field411 == 85 && Login.Login_username.length() > 0) { + if (ArchiveDiskAction.field411 == 85 && Login.Login_username.length() > 0) { Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); } - if (IndexStoreAction.field411 == 84 || IndexStoreAction.field411 == 80) { + if (ArchiveDiskAction.field411 == 84 || ArchiveDiskAction.field411 == 80) { Login.currentLoginField = 1; } @@ -272,15 +273,15 @@ public final class class54 { Login.Login_username = Login.Login_username + GzipDecompressor.field378; } } else if (Login.currentLoginField == 1) { - if (IndexStoreAction.field411 == 85 && Login.Login_password.length() > 0) { + if (ArchiveDiskAction.field411 == 85 && Login.Login_password.length() > 0) { Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); } - if (IndexStoreAction.field411 == 84 || IndexStoreAction.field411 == 80) { + if (ArchiveDiskAction.field411 == 84 || ArchiveDiskAction.field411 == 80) { Login.currentLoginField = 0; } - if (IndexStoreAction.field411 == 84) { + if (ArchiveDiskAction.field411 == 84) { Login.Login_username = Login.Login_username.trim(); if (Login.Login_username.length() == 0) { method1089("", "Please enter your username/email address.", ""); @@ -309,15 +310,15 @@ public final class class54 { } if (Login.loginIndex == 3) { - var20 = Login.loginBoxX + 180; - var9 = 276; - if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { + var9 = Login.loginBoxX + 180; + var20 = 276; + if (var1 == 1 && var2 >= var9 - 75 && var2 <= var9 + 75 && var17 >= var20 - 20 && var17 <= var20 + 20) { MouseHandler.method1084(false); } - var20 = Login.loginBoxX + 180; - var9 = 326; - if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { + var9 = Login.loginBoxX + 180; + var20 = 326; + if (var1 == 1 && var2 >= var9 - 75 && var2 <= var9 + 75 && var17 >= var20 - 20 && var17 <= var20 + 20) { method1089("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); Login.loginIndex = 5; return; @@ -325,9 +326,9 @@ public final class class54 { } else { int var13; if (Login.loginIndex == 4) { - var20 = Login.loginBoxX + 180 - 80; - var9 = 321; - if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { + var9 = Login.loginBoxX + 180 - 80; + var20 = 321; + if (var1 == 1 && var2 >= var9 - 75 && var2 <= var9 + 75 && var17 >= var20 - 20 && var17 <= var20 + 20) { Login.otp.trim(); if (Login.otp.length() != 6) { method1089("", "Please enter a 6-digit PIN.", ""); @@ -347,11 +348,11 @@ public final class class54 { } if (var1 == 1 && var2 >= Login.loginBoxX + 180 - 34 && var2 <= Login.loginBoxX + 34 + 180 && var17 >= 351 && var17 <= 363) { - WorldMapCacheName.method635(Message.method1227("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); + WorldMapCacheName.openURL(Message.method1227("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); } - var20 = Login.loginBoxX + 180 + 80; - if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { + var9 = Login.loginBoxX + 180 + 80; + if (var1 == 1 && var2 >= var9 - 75 && var2 <= var9 + 75 && var17 >= var20 - 20 && var17 <= var20 + 20) { Login.loginIndex = 0; Login.Login_username = ""; Login.Login_password = ""; @@ -369,18 +370,18 @@ public final class class54 { } } - if (IndexStoreAction.field411 == 13) { + if (ArchiveDiskAction.field411 == 13) { Login.loginIndex = 0; Login.Login_username = ""; Login.Login_password = ""; class13.otpInt = 0; Login.otp = ""; } else { - if (IndexStoreAction.field411 == 85 && Login.otp.length() > 0) { + if (ArchiveDiskAction.field411 == 85 && Login.otp.length() > 0) { Login.otp = Login.otp.substring(0, Login.otp.length() - 1); } - if (IndexStoreAction.field411 == 84) { + if (ArchiveDiskAction.field411 == 84) { Login.otp.trim(); if (Login.otp.length() != 6) { method1089("", "Please enter a 6-digit PIN.", ""); @@ -401,15 +402,15 @@ public final class class54 { } } } else if (Login.loginIndex == 5) { - var20 = Login.loginBoxX + 180 - 80; - var9 = 321; - if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { + var9 = Login.loginBoxX + 180 - 80; + var20 = 321; + if (var1 == 1 && var2 >= var9 - 75 && var2 <= var9 + 75 && var17 >= var20 - 20 && var17 <= var20 + 20) { NPCDefinition.method5162(); return; } - var20 = Login.loginBoxX + 180 + 80; - if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { + var9 = Login.loginBoxX + 180 + 80; + if (var1 == 1 && var2 >= var9 - 75 && var2 <= var9 + 75 && var17 >= var20 - 20 && var17 <= var20 + 20) { MouseHandler.method1084(true); } @@ -417,7 +418,7 @@ public final class class54 { if (UrlRequester.field930 != null) { var13 = UrlRequester.field930.field43 / 2; if (var1 == 1 && var2 >= UrlRequester.field930.field41 - var13 && var2 <= var13 + UrlRequester.field930.field41 && var17 >= var19 - 15 && var17 < var19) { - WorldMapCacheName.method635(Message.method1227("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); + WorldMapCacheName.openURL(Message.method1227("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); } } @@ -431,14 +432,14 @@ public final class class54 { } } - if (IndexStoreAction.field411 == 13) { + if (ArchiveDiskAction.field411 == 13) { MouseHandler.method1084(true); } else { - if (IndexStoreAction.field411 == 85 && Login.Login_username.length() > 0) { + if (ArchiveDiskAction.field411 == 85 && Login.Login_username.length() > 0) { Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); } - if (IndexStoreAction.field411 == 84) { + if (ArchiveDiskAction.field411 == 84) { NPCDefinition.method5162(); return; } @@ -460,38 +461,38 @@ public final class class54 { return; } - } while(IndexStoreAction.field411 != 84 && IndexStoreAction.field411 != 13); + } while(ArchiveDiskAction.field411 != 84 && ArchiveDiskAction.field411 != 13); MouseHandler.method1084(true); } } if (Login.loginIndex == 7) { - var20 = Login.loginBoxX + 180 - 80; - var9 = 321; - if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { - WorldMapCacheName.method635(Message.method1227("secure", true) + "m=dob/set_dob.ws", true, false); + var9 = Login.loginBoxX + 180 - 80; + var20 = 321; + if (var1 == 1 && var2 >= var9 - 75 && var2 <= var9 + 75 && var17 >= var20 - 20 && var17 <= var20 + 20) { + WorldMapCacheName.openURL(Message.method1227("secure", true) + "m=dob/set_dob.ws", true, false); method1089("", "Page has opened in a new window.", "(Please check your popup blocker.)"); Login.loginIndex = 6; return; } - var20 = Login.loginBoxX + 180 + 80; - if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { + var9 = Login.loginBoxX + 180 + 80; + if (var1 == 1 && var2 >= var9 - 75 && var2 <= var9 + 75 && var17 >= var20 - 20 && var17 <= var20 + 20) { MouseHandler.method1084(true); } } else if (Login.loginIndex == 8) { - var20 = Login.loginBoxX + 180 - 80; - var9 = 321; - if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { - WorldMapCacheName.method635("https://www.jagex.com/terms/privacy/#eight", true, false); + var9 = Login.loginBoxX + 180 - 80; + var20 = 321; + if (var1 == 1 && var2 >= var9 - 75 && var2 <= var9 + 75 && var17 >= var20 - 20 && var17 <= var20 + 20) { + WorldMapCacheName.openURL("https://www.jagex.com/terms/privacy/#eight", true, false); method1089("", "Page has opened in a new window.", "(Please check your popup blocker.)"); Login.loginIndex = 6; return; } - var20 = Login.loginBoxX + 180 + 80; - if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { + var9 = Login.loginBoxX + 180 + 80; + if (var1 == 1 && var2 >= var9 - 75 && var2 <= var9 + 75 && var17 >= var20 - 20 && var17 <= var20 + 20) { MouseHandler.method1084(true); } } else if (Login.loginIndex == 12) { @@ -510,7 +511,7 @@ public final class class54 { var18 = Login.loginBoxX + 180; var19 = 276; if (var1 == 1 && var2 >= var18 - 75 && var2 <= var18 + 75 && var17 >= var19 - 20 && var17 <= var19 + 20) { - WorldMapCacheName.method635(var21, true, false); + WorldMapCacheName.openURL(var21, true, false); method1089("", "Page has opened in a new window.", "(Please check your popup blocker.)"); Login.loginIndex = 6; return; @@ -526,21 +527,21 @@ public final class class54 { } } else { while (Decimator.method2490()) { - if (IndexStoreAction.field411 == 84) { + if (ArchiveDiskAction.field411 == 84) { MouseHandler.method1084(false); - } else if (IndexStoreAction.field411 == 13) { + } else if (ArchiveDiskAction.field411 == 13) { Login.loginIndex = 0; } } - var20 = Varps.loginBoxCenter - 80; - var9 = 321; - if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { + var9 = Varps.loginBoxCenter - 80; + var20 = 321; + if (var1 == 1 && var2 >= var9 - 75 && var2 <= var9 + 75 && var17 >= var20 - 20 && var17 <= var20 + 20) { MouseHandler.method1084(false); } - var20 = Varps.loginBoxCenter + 80; - if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { + var9 = Varps.loginBoxCenter + 80; + if (var1 == 1 && var2 >= var9 - 75 && var2 <= var9 + 75 && var17 >= var20 - 20 && var17 <= var20 + 20) { Login.loginIndex = 0; } } @@ -596,16 +597,16 @@ public final class class54 { break; } - if (IndexStoreAction.field411 == 13) { + if (ArchiveDiskAction.field411 == 13) { FontName.closeWorldSelect(); break; } - if (IndexStoreAction.field411 == 96) { + if (ArchiveDiskAction.field411 == 96) { if (Login.worldSelectPage > 0 && SecureRandomFuture.worldSelectLeftSprite != null) { --Login.worldSelectPage; } - } else if (IndexStoreAction.field411 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && NetSocket.worldSelectRightSprite != null) { + } else if (ArchiveDiskAction.field411 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && NetSocket.worldSelectRightSprite != null) { ++Login.worldSelectPage; } } @@ -639,7 +640,7 @@ public final class class54 { return 1; } else { WorldMapArea var4; - if (var0 == 6601) { + if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; String var14 = ""; var4 = BufferedFile.worldMap().getMapArea(var3); @@ -649,45 +650,45 @@ public final class class54 { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var14; return 1; - } else if (var0 == 6602) { + } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; BufferedFile.worldMap().setCurrentMapAreaId(var3); return 1; - } else if (var0 == 6603) { + } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().getZoomLevel(); return 1; - } else if (var0 == 6604) { + } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; BufferedFile.worldMap().setZoomLevel(var3); return 1; - } else if (var0 == 6605) { + } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().isCacheLoaded() ? 1 : 0; return 1; } else { - TileLocation var5; - if (var0 == 6606) { - var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); + Coord var5; + if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { + var5 = new Coord(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); BufferedFile.worldMap().setWorldMapPositionTarget(var5.x, var5.y); return 1; - } else if (var0 == 6607) { - var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); - BufferedFile.worldMap().method371(var5.x, var5.y); + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { + var5 = new Coord(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); + BufferedFile.worldMap().setWorldMapPositionTargetInstant(var5.x, var5.y); return 1; - } else if (var0 == 6608) { - var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); - BufferedFile.worldMap().method372(var5.plane, var5.x, var5.y); + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { + var5 = new Coord(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); + BufferedFile.worldMap().jumpToSourceCoord(var5.plane, var5.x, var5.y); return 1; - } else if (var0 == 6609) { - var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); - BufferedFile.worldMap().method373(var5.plane, var5.x, var5.y); + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { + var5 = new Coord(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); + BufferedFile.worldMap().jumpToSourceCoordInstant(var5.plane, var5.x, var5.y); return 1; - } else if (var0 == 6610) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().method374(); - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().method375(); + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().getDisplayX(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().getDisplayY(); return 1; } else { WorldMapArea var6; - if (var0 == 6611) { + if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = BufferedFile.worldMap().getMapArea(var3); if (var6 == null) { @@ -697,7 +698,7 @@ public final class class54 { } return 1; - } else if (var0 == 6612) { + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = BufferedFile.worldMap().getMapArea(var3); if (var6 == null) { @@ -709,7 +710,7 @@ public final class class54 { } return 1; - } else if (var0 == 6613) { + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = BufferedFile.worldMap().getMapArea(var3); if (var6 == null) { @@ -725,7 +726,7 @@ public final class class54 { } return 1; - } else if (var0 == 6614) { + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = BufferedFile.worldMap().getMapArea(var3); if (var6 == null) { @@ -736,7 +737,7 @@ public final class class54 { return 1; } else if (var0 == 6615) { - var5 = BufferedFile.worldMap().method376(); + var5 = BufferedFile.worldMap().getDisplayCoord(); if (var5 == null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; @@ -746,11 +747,11 @@ public final class class54 { } return 1; - } else if (var0 == 6616) { + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().currentMapAreaId(); return 1; - } else if (var0 == 6617) { - var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { + var5 = new Coord(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); var6 = BufferedFile.worldMap().getCurrentMapArea(); if (var6 == null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; @@ -769,9 +770,9 @@ public final class class54 { return 1; } } else { - TileLocation var7; + Coord var7; if (var0 == 6618) { - var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); + var5 = new Coord(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); var6 = BufferedFile.worldMap().getCurrentMapArea(); if (var6 == null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; @@ -788,23 +789,23 @@ public final class class54 { return 1; } } else { - TileLocation var8; + Coord var8; if (var0 == 6619) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; - var8 = new TileLocation(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); - TotalQuantityComparator.method96(var3, var8, false); + var8 = new Coord(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); + GrandExchangeOfferTotalQuantityComparator.method96(var3, var8, false); return 1; } else if (var0 == 6620) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; - var8 = new TileLocation(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); - TotalQuantityComparator.method96(var3, var8, true); + var8 = new Coord(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); + GrandExchangeOfferTotalQuantityComparator.method96(var3, var8, true); return 1; - } else if (var0 == 6621) { + } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; - var8 = new TileLocation(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); + var8 = new Coord(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); var4 = BufferedFile.worldMap().getMapArea(var3); if (var4 == null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; @@ -813,12 +814,12 @@ public final class class54 { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4.containsCoord(var8.plane, var8.x, var8.y) ? 1 : 0; return 1; } - } else if (var0 == 6622) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().method377(); - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().method378(); + } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().getDisplayWith(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().getDisplayHeight(); return 1; } else if (var0 == 6623) { - var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); + var5 = new Coord(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); var6 = BufferedFile.worldMap().mapAreaAtCoord(var5.plane, var5.x, var5.y); if (var6 == null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; @@ -841,54 +842,54 @@ public final class class54 { return 1; } else { boolean var9; - if (var0 == 6628) { + if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { var9 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - BufferedFile.worldMap().perpetualFlash(var9); + BufferedFile.worldMap().setPerpetualFlash(var9); return 1; - } else if (var0 == 6629) { + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; BufferedFile.worldMap().flashElement(var3); return 1; - } else if (var0 == 6630) { + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; BufferedFile.worldMap().flashCategory(var3); return 1; - } else if (var0 == 6631) { + } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { BufferedFile.worldMap().stopCurrentFlashes(); return 1; - } else if (var0 == 6632) { + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { var9 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; BufferedFile.worldMap().setElementsEnabled(var9); return 1; } else { boolean var10; - if (var0 == 6633) { + if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var10 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1; BufferedFile.worldMap().disableElement(var3, var10); return 1; - } else if (var0 == 6634) { + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var10 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1; BufferedFile.worldMap().disableCategory(var3, var10); return 1; - } else if (var0 == 6635) { + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().getElementsEnabled() ? 1 : 0; return 1; - } else if (var0 == 6636) { + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().isElementDisabled(var3) ? 1 : 0; return 1; - } else if (var0 == 6637) { + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().isCategoryDisabled(var3) ? 1 : 0; return 1; } else if (var0 == 6638) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; - var8 = new TileLocation(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); + var8 = new Coord(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); var7 = BufferedFile.worldMap().method385(var3, var8); if (var7 == null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; @@ -899,31 +900,31 @@ public final class class54 { return 1; } else { AbstractWorldMapIcon var11; - if (var0 == 6639) { + if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { var11 = BufferedFile.worldMap().iconStart(); if (var11 == null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.vmethod395(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.getElement(); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.coord2.packed(); } return 1; - } else if (var0 == 6640) { + } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { var11 = BufferedFile.worldMap().iconNext(); if (var11 == null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.vmethod395(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.getElement(); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.coord2.packed(); } return 1; } else { WorldMapElement var12; - if (var0 == 6693) { + if (var0 == ScriptOpcodes.MEC_TEXT) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var12 = ViewportMouse.getWorldMapElement(var3); if (var12.field1021 == null) { @@ -933,12 +934,12 @@ public final class class54 { } return 1; - } else if (var0 == 6694) { + } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var12 = ViewportMouse.getWorldMapElement(var3); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var12.textSize; return 1; - } else if (var0 == 6695) { + } else if (var0 == ScriptOpcodes.MEC_CATEGORY) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var12 = ViewportMouse.getWorldMapElement(var3); if (var12 == null) { @@ -948,7 +949,7 @@ public final class class54 { } return 1; - } else if (var0 == 6696) { + } else if (var0 == ScriptOpcodes.MEC_SPRITE) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var12 = ViewportMouse.getWorldMapElement(var3); if (var12 == null) { @@ -1045,14 +1046,14 @@ public final class class54 { Client.field202 += (var6 - Client.field202) / 80; } - MouseRecorder.field566 = class32.getTileHeight(Canvas.localPlayer.x, Canvas.localPlayer.y, SoundSystem.plane) - Client.cameraFollowHeight; + MouseRecorder.field566 = class32.getTileHeight(Canvas.localPlayer.x, Canvas.localPlayer.y, SoundSystem.plane) - Client.camFollowHeight; } else if (Client.oculusOrbState == 1) { if (Client.field199 && Canvas.localPlayer != null) { var0 = Canvas.localPlayer.pathX[0]; var1 = Canvas.localPlayer.pathY[0]; if (var0 >= 0 && var1 >= 0 && var0 < 104 && var1 < 104) { MouseHandler.oculusOrbFocalPointX = Canvas.localPlayer.x; - var2 = class32.getTileHeight(Canvas.localPlayer.x, Canvas.localPlayer.y, SoundSystem.plane) - Client.cameraFollowHeight; + var2 = class32.getTileHeight(Canvas.localPlayer.x, Canvas.localPlayer.y, SoundSystem.plane) - Client.camFollowHeight; if (var2 < MouseRecorder.field566) { MouseRecorder.field566 = var2; } @@ -1096,7 +1097,7 @@ public final class class54 { var2 = 0; if (var11 >= 0 || var10 != 0) { - var2 = KeyHandler.KeyHandler_pressedKeys[81] ? Client.field197 : Client.oculusOrbNormalSpeed; + var2 = KeyHandler.KeyHandler_pressedKeys[81] ? Client.oculusOrbSlowedSpeed : Client.oculusOrbNormalSpeed; var2 *= 16; Client.field195 = var11; Client.field196 = var10; @@ -1166,14 +1167,14 @@ public final class class54 { Client.field192 = MouseHandler.MouseHandler_x; } - Client.minimapOrientation = Client.field190 / 2 + Client.minimapOrientation & 2047; - Client.cameraPitchTarget += Client.field191 / 2; - if (Client.cameraPitchTarget < 128) { - Client.cameraPitchTarget = 128; + Client.camAngleY = Client.field190 / 2 + Client.camAngleY & 2047; + Client.camAngleX += Client.field191 / 2; + if (Client.camAngleX < 128) { + Client.camAngleX = 128; } - if (Client.cameraPitchTarget > 383) { - Client.cameraPitchTarget = 383; + if (Client.camAngleX > 383) { + Client.camAngleX = 383; } } diff --git a/runescape-client/src/main/java/class60.java b/runescape-client/src/main/java/class60.java index 1fe5e4fdba..d02a243340 100644 --- a/runescape-client/src/main/java/class60.java +++ b/runescape-client/src/main/java/class60.java @@ -19,7 +19,7 @@ public class class60 { signature = "(Lir;Lir;Lir;I)V", garbageValue = "1583108922" ) - public static void method1172(AbstractIndexCache var0, AbstractIndexCache var1, AbstractIndexCache var2) { + public static void method1172(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) { HitSplatDefinition.field382 = var0; HitSplatDefinition.field383 = var1; HitSplatDefinition.field384 = var2; diff --git a/runescape-client/src/main/java/class65.java b/runescape-client/src/main/java/class65.java index 9d498f0f79..ae0ceac3db 100644 --- a/runescape-client/src/main/java/class65.java +++ b/runescape-client/src/main/java/class65.java @@ -33,7 +33,7 @@ public class class65 extends RouteStrategy { ) static final void method1232(Actor var0, int var1) { if (var0.field19 > Client.cycle) { - SpriteIds.method5828(var0); + GraphicsDefaults.method5828(var0); } else { int var2; int var3; @@ -56,7 +56,7 @@ public class class65 extends RouteStrategy { var0.orientation = var0.field21; var0.field9 = var0.orientation; } else { - var0.movementSequence = var0.idleSequence; + var0.movementSequence = var0.readySequence; if (var0.pathLength == 0) { var0.field24 = 0; } else { @@ -107,13 +107,13 @@ public class class65 extends RouteStrategy { var6 -= 2048; } - int var8 = var0.walkTurnSequence; + int var8 = var0.walkBackSequence; if (var6 >= -256 && var6 <= 256) { var8 = var0.walkSequence; } else if (var6 >= 256 && var6 < 768) { - var8 = var0.walkTurnRightSequence; + var8 = var0.walkRightSequence; } else if (var6 >= -768 && var6 <= -256) { - var8 = var0.walkTurnLeftSequence; + var8 = var0.walkLeftSequence; } if (var8 == -1) { @@ -232,7 +232,7 @@ public class class65 extends RouteStrategy { var0.method23(); } - IndexStoreAction.method4553(var0); + ArchiveDiskAction.method4553(var0); ChatChannel.method2225(var0); } } diff --git a/runescape-client/src/main/java/class80.java b/runescape-client/src/main/java/class80.java index c98f5a904b..360e9b06c2 100644 --- a/runescape-client/src/main/java/class80.java +++ b/runescape-client/src/main/java/class80.java @@ -17,7 +17,7 @@ public class class80 { static void method2015() { if (Login.field465) { Login.titleboxSprite = null; - IndexCacheLoader.titlebuttonSprite = null; + ArchiveLoader.titlebuttonSprite = null; WorldMapEvent.runesSprite = null; Login.leftTitleSprite = null; Fonts.rightTitleSprite = null; diff --git a/runescape-client/src/main/java/class83.java b/runescape-client/src/main/java/class83.java index 89a1da6b66..b6afdbadba 100644 --- a/runescape-client/src/main/java/class83.java +++ b/runescape-client/src/main/java/class83.java @@ -50,7 +50,7 @@ public class class83 { signature = "(Lir;II)Llq;", garbageValue = "1413048059" ) - public static IndexedSprite method2028(AbstractIndexCache var0, int var1) { + public static IndexedSprite method2028(AbstractArchive var0, int var1) { return !RouteStrategy.loadSpriteFlat(var0, var1) ? null : ServerPacket.createIndexedSprite(); } diff --git a/runescape-client/src/main/java/net/runelite/rs/ScriptOpcodes.java b/runescape-client/src/main/java/net/runelite/rs/ScriptOpcodes.java new file mode 100644 index 0000000000..1c6980a8b4 --- /dev/null +++ b/runescape-client/src/main/java/net/runelite/rs/ScriptOpcodes.java @@ -0,0 +1,478 @@ +package net.runelite.rs; + +public class ScriptOpcodes { + public static final int ICONST = 0; + public static final int GET_VARP = 1; + public static final int SET_VARP = 2; + public static final int SCONST = 3; + public static final int JUMP = 6; + public static final int IF_ICMPNE = 7; + public static final int IF_ICMPEQ = 8; + public static final int IF_ICMPLT = 9; + public static final int IF_ICMPGT = 10; + public static final int RETURN = 21; + public static final int GET_VARBIT = 25; + public static final int SET_VARBIT = 27; + public static final int IF_ICMPLE = 31; + public static final int IF_ICMPGE = 32; + public static final int ILOAD = 33; + public static final int ISTORE = 34; + public static final int SLOAD = 35; + public static final int SSTORE = 36; + public static final int JOIN_STRING = 37; + public static final int POP_INT = 38; + public static final int POP_STRING = 39; + public static final int INVOKE = 40; + public static final int GET_VARC_INT = 42; + public static final int SET_VARC_INT = 43; + public static final int DEFINE_ARRAY = 44; + public static final int GET_ARRAY_INT = 45; + public static final int SET_ARRAY_INT = 46; + public static final int GET_VARC_STRING_OLD = 47; + public static final int SET_VARC_STRING_OLD = 48; + public static final int GET_VARC_STRING = 49; + public static final int SET_VARC_STRING = 50; + public static final int SWITCH = 60; + public static final int CC_CREATE = 100; + public static final int CC_DELETE = 101; + public static final int CC_DELETEALL = 102; + public static final int CC_FIND = 200; + public static final int IF_FIND = 201; + public static final int CC_SETPOSITION = 1000; + public static final int CC_SETSIZE = 1001; + public static final int CC_SETHIDE = 1003; + public static final int CC_SETNOCLICKTHROUGH = 1005; + public static final int CC_SETNOSCROLLTHROUGH = 1006; + public static final int CC_SETSCROLLPOS = 1100; + public static final int CC_SETCOLOUR = 1101; + public static final int CC_SETFILL = 1102; + public static final int CC_SETTRANS = 1103; + public static final int CC_SETLINEWID = 1104; + public static final int CC_SETGRAPHIC = 1105; + public static final int CC_SET2DANGLE = 1106; + public static final int CC_SETTILING = 1107; + public static final int CC_SETMODEL = 1108; + public static final int CC_SETMODELANGLE = 1109; + public static final int CC_SETMODELANIM = 1110; + public static final int CC_SETMODELORTHOG = 1111; + public static final int CC_SETTEXT = 1112; + public static final int CC_SETTEXTFONT = 1113; + public static final int CC_SETTEXTALIGN = 1114; + public static final int CC_SETTEXTSHADOW = 1115; + public static final int CC_SETOUTLINE = 1116; + public static final int CC_SETGRAPHICSHADOW = 1117; + public static final int CC_SETVFLIP = 1118; + public static final int CC_SETHFLIP = 1119; + public static final int CC_SETSCROLLSIZE = 1120; + public static final int CC_RESUME_PAUSEBUTTON = 1121; + public static final int CC_SETFILLCOLOUR = 1123; + public static final int CC_SETLINEDIRECTION = 1126; + public static final int CC_SETOBJECT = 1200; + public static final int CC_SETNPCHEAD = 1201; + public static final int CC_SETPLAYERHEAD_SELF = 1202; + public static final int CC_SETOBJECT_NONUM = 1205; + public static final int CC_SETOBJECT_ALWAYS_NUM = 1212; + public static final int CC_SETOP = 1300; + public static final int CC_SETDRAGGABLE = 1301; + public static final int CC_SETDRAGGABLEBEHAVIOR = 1302; + public static final int CC_SETDRAGDEADZONE = 1303; + public static final int CC_SETDRAGDEADTIME = 1304; + public static final int CC_SETOPBASE = 1305; + public static final int CC_SETTARGETVERB = 1306; + public static final int CC_CLEAROPS = 1307; + public static final int CC_SETONCLICK = 1400; + public static final int CC_SETONHOLD = 1401; + public static final int CC_SETONRELEASE = 1402; + public static final int CC_SETONMOUSEOVER = 1403; + public static final int CC_SETONMOUSELEAVE = 1404; + public static final int CC_SETONDRAG = 1405; + public static final int CC_SETONTARGETLEAVE = 1406; + public static final int CC_SETONVARTRANSMIT = 1407; + public static final int CC_SETONTIMER = 1408; + public static final int CC_SETONOP = 1409; + public static final int CC_SETONDRAGCOMPLETE = 1410; + public static final int CC_SETONCLICKREPEAT = 1411; + public static final int CC_SETONMOUSEREPEAT = 1412; + public static final int CC_SETONINVTRANSMIT = 1414; + public static final int CC_SETONSTATTRANSMIT = 1415; + public static final int CC_SETONTARGETENTER = 1416; + public static final int CC_SETONSCROLLWHEEL = 1417; + public static final int CC_SETONCHATTRANSMIT = 1418; + public static final int CC_SETONKEY = 1419; + public static final int CC_SETONFRIENDTRANSMIT = 1420; + public static final int CC_SETONCLANTRANSMIT = 1421; + public static final int CC_SETONMISCTRANSMIT = 1422; + public static final int CC_SETONDIALOGABORT = 1423; + public static final int CC_SETONSUBCHANGE = 1424; + public static final int CC_SETONSTOCKTRANSMIT = 1425; + public static final int CC_SETONRESIZE = 1427; + public static final int CC_GETX = 1500; + public static final int CC_GETY = 1501; + public static final int CC_GETWIDTH = 1502; + public static final int CC_GETHEIGHT = 1503; + public static final int CC_GETHIDE = 1504; + public static final int CC_GETLAYER = 1505; + public static final int CC_GETSCROLLX = 1600; + public static final int CC_GETSCROLLY = 1601; + public static final int CC_GETTEXT = 1602; + public static final int CC_GETSCROLLWIDTH = 1603; + public static final int CC_GETSCROLLHEIGHT = 1604; + public static final int CC_GETMODELZOOM = 1605; + public static final int CC_GETMODELANGLE_X = 1606; + public static final int CC_GETMODELANGLE_Z = 1607; + public static final int CC_GETMODELANGLE_Y = 1608; + public static final int CC_GETTRANS = 1609; + public static final int CC_GETCOLOUR = 1611; + public static final int CC_GETFILLCOLOUR = 1612; + public static final int CC_GETINVOBJECT = 1700; + public static final int CC_GETINVCOUNT = 1701; + public static final int CC_GETID = 1702; + public static final int CC_GETTARGETMASK = 1800; + public static final int CC_GETOP = 1801; + public static final int CC_GETOPBASE = 1802; + public static final int CC_CALLONRESIZE = 1927; + public static final int IF_SETPOSITION = 2000; + public static final int IF_SETSIZE = 2001; + public static final int IF_SETHIDE = 2003; + public static final int IF_SETNOCLICKTHROUGH = 2005; + public static final int IF_SETSCROLLPOS = 2100; + public static final int IF_SETCOLOUR = 2101; + public static final int IF_SETFILL = 2102; + public static final int IF_SETTRANS = 2103; + public static final int IF_SETLINEWID = 2104; + public static final int IF_SETGRAPHIC = 2105; + public static final int IF_SET2DANGLE = 2106; + public static final int IF_SETTILING = 2107; + public static final int IF_SETMODEL = 2108; + public static final int IF_SETMODELANGLE = 2109; + public static final int IF_SETMODELANIM = 2110; + public static final int IF_SETMODELORTHOG = 2111; + public static final int IF_SETTEXT = 2112; + public static final int IF_SETTEXTFONT = 2113; + public static final int IF_SETTEXTALIGN = 2114; + public static final int IF_SETTEXTSHADOW = 2115; + public static final int IF_SETOUTLINE = 2116; + public static final int IF_SETGRAPHICSHADOW = 2117; + public static final int IF_SETVFLIP = 2118; + public static final int IF_SETHFLIP = 2119; + public static final int IF_SETSCROLLSIZE = 2120; + public static final int IF_RESUME_PAUSEBUTTON = 2121; + public static final int IF_SETFILLCOLOUR = 2123; + public static final int IF_SETLINEDIRECTION = 2126; + public static final int IF_SETOBJECT = 2200; + public static final int IF_SETNPCHEAD = 2201; + public static final int IF_SETPLAYERHEAD_SELF = 2202; + public static final int IF_SETOBJECT_NONUM = 2205; + public static final int IF_SETOBJECT_ALWAYS_NUM = 2212; + public static final int IF_SETOP = 2300; + public static final int IF_SETDRAGGABLE = 2301; + public static final int IF_SETDRAGGABLEBEHAVIOR = 2302; + public static final int IF_SETDRAGDEADZONE = 2303; + public static final int IF_SETDRAGDEADTIME = 2304; + public static final int IF_SETOPBASE = 2305; + public static final int IF_SETTARGETVERB = 2306; + public static final int IF_CLEAROPS = 2307; + public static final int IF_SETOPKEY = 2350; + public static final int IF_SETOPTKEY = 2351; + public static final int IF_SETOPKEYRATE = 2352; + public static final int IF_SETOPTKEYRATE = 2353; + public static final int IF_SETOPKEYIGNOREHELD = 2354; + public static final int IF_SETOPTKEYIGNOREHELD = 2355; + public static final int IF_SETONCLICK = 2400; + public static final int IF_SETONHOLD = 2401; + public static final int IF_SETONRELEASE = 2402; + public static final int IF_SETONMOUSEOVER = 2403; + public static final int IF_SETONMOUSELEAVE = 2404; + public static final int IF_SETONDRAG = 2405; + public static final int IF_SETONTARGETLEAVE = 2406; + public static final int IF_SETONVARTRANSMIT = 2407; + public static final int IF_SETONTIMER = 2408; + public static final int IF_SETONOP = 2409; + public static final int IF_SETONDRAGCOMPLETE = 2410; + public static final int IF_SETONCLICKREPEAT = 2411; + public static final int IF_SETONMOUSEREPEAT = 2412; + public static final int IF_SETONINVTRANSMIT = 2414; + public static final int IF_SETONSTATTRANSMIT = 2415; + public static final int IF_SETONTARGETENTER = 2416; + public static final int IF_SETONSCROLLWHEEL = 2417; + public static final int IF_SETONCHATTRANSMIT = 2418; + public static final int IF_SETONKEY = 2419; + public static final int IF_SETONFRIENDTRANSMIT = 2420; + public static final int IF_SETONCLANTRANSMIT = 2421; + public static final int IF_SETONMISCTRANSMIT = 2422; + public static final int IF_SETONDIALOGABORT = 2423; + public static final int IF_SETONSUBCHANGE = 2424; + public static final int IF_SETONSTOCKTRANSMIT = 2425; + public static final int IF_SETONRESIZE = 2427; + public static final int IF_GETX = 2500; + public static final int IF_GETY = 2501; + public static final int IF_GETWIDTH = 2502; + public static final int IF_GETHEIGHT = 2503; + public static final int IF_GETHIDE = 2504; + public static final int IF_GETLAYER = 2505; + public static final int IF_GETSCROLLX = 2600; + public static final int IF_GETSCROLLY = 2601; + public static final int IF_GETTEXT = 2602; + public static final int IF_GETSCROLLWIDTH = 2603; + public static final int IF_GETSCROLLHEIGHT = 2604; + public static final int IF_GETMODELZOOM = 2605; + public static final int IF_GETMODELANGLE_X = 2606; + public static final int IF_GETMODELANGLE_Z = 2607; + public static final int IF_GETMODELANGLE_Y = 2608; + public static final int IF_GETTRANS = 2609; + public static final int IF_GETCOLOUR = 2611; + public static final int IF_GETFILLCOLOUR = 2612; + public static final int IF_GETINVOBJECT = 2700; + public static final int IF_GETINVCOUNT = 2701; + public static final int IF_HASSUB = 2702; + public static final int IF_GETTOP = 2706; + public static final int IF_GETTARGETMASK = 2800; + public static final int IF_GETOP = 2801; + public static final int IF_GETOPBASE = 2802; + public static final int IF_CALLONRESIZE = 2927; + public static final int MES = 3100; + public static final int ANIM = 3101; + public static final int IF_CLOSE = 3103; + public static final int RESUME_COUNTDIALOG = 3104; + public static final int RESUME_NAMEDIALOG = 3105; + public static final int RESUME_STRINGDIALOG = 3106; + public static final int OPPLAYER = 3107; + public static final int IF_DRAGPICKUP = 3108; + public static final int CC_DRAGPICKUP = 3109; + public static final int MOUSECAM = 3110; + public static final int GETREMOVEROOFS = 3111; + public static final int SETREMOVEROOFS = 3112; + public static final int OPENURL = 3113; + public static final int RESUME_OBJDIALOG = 3115; + public static final int BUG_REPORT = 3116; + public static final int SETSHIFTCLICKDROP = 3117; + public static final int SETSHOWMOUSEOVERTEXT = 3118; + public static final int RENDERSELF = 3119; + public static final int SETSHOWMOUSECROSS = 3125; + public static final int SETSHOWLOADINGMESSAGES = 3126; + public static final int SETTAPTODROP = 3127; + public static final int GETTAPTODROP = 3128; + public static final int SETOCULUSORBSPEED = 3129; + public static final int GETCANVASSIZE = 3132; + public static final int SETHIDEUSERNAME = 3141; + public static final int GETHIDEUSERNAME = 3142; + public static final int SETREMEMBERUSERNAME = 3143; + public static final int GETREMEMBERUSERNAME = 3144; + public static final int SETTITLEMUSICENABLED = 3146; + public static final int GETTITLEMUSICENABLED = 3147; + public static final int SOUND_SYNTH = 3200; + public static final int SOUND_SONG = 3201; + public static final int SOUND_JINGLE = 3202; + public static final int CLIENTCLOCK = 3300; + public static final int INV_GETOBJ = 3301; + public static final int INV_GETNUM = 3302; + public static final int INV_TOTAL = 3303; + public static final int INV_SIZE = 3304; + public static final int STAT = 3305; + public static final int STAT_BASE = 3306; + public static final int STAT_XP = 3307; + public static final int COORD = 3308; + public static final int COORDX = 3309; + public static final int COORDZ = 3310; + public static final int COORDY = 3311; + public static final int MAP_MEMBERS = 3312; + public static final int INVOTHER_GETOBJ = 3313; + public static final int INVOTHER_GETNUM = 3314; + public static final int INVOTHER_TOTAL = 3315; + public static final int STAFFMODLEVEL = 3316; + public static final int REBOOTTIMER = 3317; + public static final int MAP_WORLD = 3318; + public static final int RUNENERGY_VISIBLE = 3321; + public static final int RUNWEIGHT_VISIBLE = 3322; + public static final int PLAYERMOD = 3323; + public static final int WORLDFLAGS = 3324; + public static final int MOVECOORD = 3325; + public static final int ENUM_STRING = 3400; + public static final int ENUM = 3408; + public static final int ENUM_GETOUTPUTCOUNT = 3411; + public static final int FRIEND_COUNT = 3600; + public static final int FRIEND_GETNAME = 3601; + public static final int FRIEND_GETWORLD = 3602; + public static final int FRIEND_GETRANK = 3603; + public static final int FRIEND_SETRANK = 3604; + public static final int FRIEND_ADD = 3605; + public static final int FRIEND_DEL = 3606; + public static final int IGNORE_ADD = 3607; + public static final int IGNORE_DEL = 3608; + public static final int FRIEND_TEST = 3609; + public static final int CLAN_GETCHATDISPLAYNAME = 3611; + public static final int CLAN_GETCHATCOUNT = 3612; + public static final int CLAN_GETCHATUSERNAME = 3613; + public static final int CLAN_GETCHATUSERWORLD = 3614; + public static final int CLAN_GETCHATUSERRANK = 3615; + public static final int CLAN_GETCHATMINKICK = 3616; + public static final int CLAN_KICKUSER = 3617; + public static final int CLAN_GETCHATRANK = 3618; + public static final int CLAN_JOINCHAT = 3619; + public static final int CLAN_LEAVECHAT = 3620; + public static final int IGNORE_COUNT = 3621; + public static final int IGNORE_GETNAME = 3622; + public static final int IGNORE_TEST = 3623; + public static final int CLAN_ISSELF = 3624; + public static final int CLAN_GETCHATOWNERNAME = 3625; + public static final int CLAN_ISFRIEND = 3626; + public static final int CLAN_ISIGNORE = 3627; + public static final int STOCKMARKET_GETOFFERTYPE = 3903; + public static final int STOCKMARKET_GETOFFERITEM = 3904; + public static final int STOCKMARKET_GETOFFERPRICE = 3905; + public static final int STOCKMARKET_GETOFFERCOUNT = 3906; + public static final int STOCKMARKET_GETOFFERCOMPLETEDCOUNT = 3907; + public static final int STOCKMARKET_GETOFFERCOMPLETEDGOLD = 3908; + public static final int STOCKMARKET_ISOFFEREMPTY = 3910; + public static final int STOCKMARKET_ISOFFERSTABLE = 3911; + public static final int STOCKMARKET_ISOFFERFINISHED = 3912; + public static final int STOCKMARKET_ISOFFERADDING = 3913; + public static final int TRADINGPOST_SORTBY_NAME = 3914; + public static final int TRADINGPOST_SORTBY_PRICE = 3915; + public static final int TRADINGPOST_SORTFILTERBY_WORLD = 3916; + public static final int TRADINGPOST_SORTBY_AGE = 3917; + public static final int TRADINGPOST_SORTBY_COUNT = 3918; + public static final int TRADINGPOST_GETTOTALOFFERS = 3919; + public static final int TRADINGPOST_GETOFFERWORLD = 3920; + public static final int TRADINGPOST_GETOFFERNAME = 3921; + public static final int TRADINGPOST_GETOFFERPREVIOUSNAME = 3922; + public static final int TRADINGPOST_GETOFFERAGE = 3923; + public static final int TRADINGPOST_GETOFFERCOUNT = 3924; + public static final int TRADINGPOST_GETOFFERPRICE = 3925; + public static final int TRADINGPOST_GETOFFERITEM = 3926; + public static final int ADD = 4000; + public static final int SUB = 4001; + public static final int MULTIPLY = 4002; + public static final int DIV = 4003; + public static final int RANDOM = 4004; + public static final int RANDOMINC = 4005; + public static final int INTERPOLATE = 4006; + public static final int ADDPERCENT = 4007; + public static final int SETBIT = 4008; + public static final int CLEARBIT = 4009; + public static final int TESTBIT = 4010; + public static final int MOD = 4011; + public static final int POW = 4012; + public static final int INVPOW = 4013; + public static final int AND = 4014; + public static final int OR = 4015; + public static final int SCALE = 4018; + public static final int APPEND_NUM = 4100; + public static final int APPEND = 4101; + public static final int APPEND_SIGNNUM = 4102; + public static final int LOWERCASE = 4103; + public static final int FROMDATE = 4104; + public static final int TEXT_GENDER = 4105; + public static final int TOSTRING = 4106; + public static final int COMPARE = 4107; + public static final int PARAHEIGHT = 4108; + public static final int PARAWIDTH = 4109; + public static final int TEXT_SWITCH = 4110; + public static final int ESCAPE = 4111; + public static final int APPEND_CHAR = 4112; + public static final int CHAR_ISPRINTABLE = 4113; + public static final int CHAR_ISALPHANUMERIC = 4114; + public static final int CHAR_ISALPHA = 4115; + public static final int CHAR_ISNUMERIC = 4116; + public static final int STRING_LENGTH = 4117; + public static final int SUBSTRING = 4118; + public static final int REMOVETAGS = 4119; + public static final int STRING_INDEXOF_CHAR = 4120; + public static final int STRING_INDEXOF_STRING = 4121; + public static final int UPPERCASE = 4122; + public static final int OC_NAME = 4200; + public static final int OC_OP = 4201; + public static final int OC_IOP = 4202; + public static final int OC_COST = 4203; + public static final int OC_STACKABLE = 4204; + public static final int OC_CERT = 4205; + public static final int OC_UNCERT = 4206; + public static final int OC_MEMBERS = 4207; + public static final int OC_PLACEHOLDER = 4208; + public static final int OC_UNPLACEHOLDER = 4209; + public static final int OC_FIND = 4210; + public static final int OC_FINDNEXT = 4211; + public static final int OC_FINDRESET = 4212; + public static final int CHAT_GETFILTER_PUBLIC = 5000; + public static final int CHAT_SETFILTER = 5001; + public static final int CHAT_SENDABUSEREPORT = 5002; + public static final int CHAT_GETHISTORY_BYTYPEANDLINE = 5003; + public static final int CHAT_GETHISTORY_BYUID = 5004; + public static final int CHAT_GETFILTER_PRIVATE = 5005; + public static final int CHAT_SENDPUBLIC = 5008; + public static final int CHAT_SENDPRIVATE = 5009; + public static final int CHAT_PLAYERNAME = 5015; + public static final int CHAT_GETFILTER_TRADE = 5016; + public static final int CHAT_GETHISTORYLENGTH = 5017; + public static final int CHAT_GETNEXTUID = 5018; + public static final int CHAT_GETPREVUID = 5019; + public static final int DOCHEAT = 5020; + public static final int CHAT_SETMESSAGEFILTER = 5021; + public static final int CHAT_GETMESSAGEFILTER = 5022; + public static final int GETWINDOWMODE = 5306; + public static final int SETWINDOWMODE = 5307; + public static final int GETDEFAULTWINDOWMODE = 5308; + public static final int SETDEFAULTWINDOWMODE = 5309; + public static final int CAM_FORCEANGLE = 5504; + public static final int CAM_GETANGLE_XA = 5505; + public static final int CAM_GETANGLE_YA = 5506; + public static final int CAM_SETFOLLOWHEIGHT = 5530; + public static final int CAM_GETFOLLOWHEIGHT = 5531; + public static final int LOGOUT = 5630; + public static final int VIEWPORT_SETFOV = 6200; + public static final int VIEWPORT_SETZOOM = 6201; + public static final int VIEWPORT_CLAMPFOV = 6202; + public static final int VIEWPORT_GETEFFECTIVESIZE = 6203; + public static final int VIEWPORT_GETZOOM = 6204; + public static final int VIEWPORT_GETFOV = 6205; + public static final int WORLDLIST_FETCH = 6500; + public static final int WORLDLIST_START = 6501; + public static final int WORLDLIST_NEXT = 6502; + public static final int WORLDLIST_SPECIFIC = 6506; + public static final int WORLDLIST_SORT = 6507; + public static final int GETWORLDINFO = 6511; + public static final int SETFOLLOWEROPSLOWPRIORITY = 6512; + public static final int NC_PARAM = 6513; + public static final int LC_PARAM = 6514; + public static final int OC_PARAM = 6515; + public static final int STRUCT_PARAM = 6516; + public static final int ON_MOBILE = 6518; + public static final int CLIENTTYPE = 6519; + public static final int BATTERYLEVEL = 6524; + public static final int BATTERYCHARGING = 6525; + public static final int WIFIAVAILABLE = 6526; + public static final int WORLDMAP_GETMAPNAME = 6601; + public static final int WORLDMAP_SETMAP = 6602; + public static final int WORLDMAP_GETZOOM = 6603; + public static final int WORLDMAP_SETZOOM = 6604; + public static final int WORLDMAP_ISLOADED = 6605; + public static final int WORLDMAP_JUMPTODISPLAYCOORD = 6606; + public static final int WORLDMAP_JUMPTODISPLAYCOORD_INSTANT = 6607; + public static final int WORLDMAP_JUMPTOSOURCECOORD = 6608; + public static final int WORLDMAP_JUMPTOSOURCECOORD_INSTANT = 6609; + public static final int WORLDMAP_GETDISPLAYPOSITION = 6610; + public static final int WORLDMAP_GETCONFIGORIGIN = 6611; + public static final int WORLDMAP_GETCONFIGSIZE = 6612; + public static final int WORLDMAP_GETCONFIGBOUNDS = 6613; + public static final int WORLDMAP_GETCONFIGZOOM = 6614; + public static final int WORLDMAP_GETCURRENTMAP = 6616; + public static final int WORLDMAP_GETDISPLAYCOORD = 6617; + public static final int WORLDMAP_COORDINMAP = 6621; + public static final int WORLDMAP_GETSIZE = 6622; + public static final int WORLDMAP_PERPETUALFLASH = 6628; + public static final int WORLDMAP_FLASHELEMENT = 6629; + public static final int WORLDMAP_FLASHELEMENTCATEGORY = 6630; + public static final int WORLDMAP_STOPCURRENTFLASHES = 6631; + public static final int WORLDMAP_DISABLEELEMENTS = 6632; + public static final int WORLDMAP_DISABLEELEMENT = 6633; + public static final int WORLDMAP_DISABLEELEMENTCATEGORY = 6634; + public static final int WORLDMAP_GETDISABLEELEMENTS = 6635; + public static final int WORLDMAP_GETDISABLEELEMENT = 6636; + public static final int WORLDMAP_GETDISABLEELEMENTCATEGORY = 6637; + public static final int WORLDMAP_LISTELEMENT_START = 6639; + public static final int WORLDMAP_LISTELEMENT_NEXT = 6640; + public static final int MEC_TEXT = 6693; + public static final int MEC_TEXTSIZE = 6694; + public static final int MEC_CATEGORY = 6695; + public static final int MEC_SPRITE = 6696; +}